Support broadcasts of predicated tensors within thread blocks #100
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,8 @@ | ||
| #include <torch/csrc/jit/codegen/cuda/ir_iostream.h> | ||
| #include <torch/csrc/jit/codegen/cuda/fusion.h> | ||
| #include <torch/csrc/jit/codegen/cuda/ir_all_nodes.h> | ||
| #include <torch/csrc/jit/codegen/cuda/lower_thread_predicate.h> | ||
| #include <torch/csrc/jit/codegen/cuda/lower_utils.h> | ||
|
|
||
| #include <iostream> | ||
|
|
||
|
|
@@ -478,15 +480,50 @@ void IRPrinter::handle(const ReductionOp* rop) { | |
| } | ||
|
|
||
| void IRPrinter::handle(const BroadcastOp* bop) { | ||
| // Check if we've lowered yet. | ||
| bool lowered = bop->out()->getValType() == ValType::TensorIndex; | ||
| if (!lowered) { | ||
| os << bop->out() << " = broadcast( " << bop->in() << " )\n"; | ||
| return; | ||
| } | ||
|
|
||
| const ir_utils::ParallelTypeBitmap domains = | ||
| ir_utils::getParallelBroadcastDomains(bop, getThreadPredicateMap()); | ||
| const bool thread_x = domains.get(ParallelType::TIDx); | ||
| const bool thread_y = domains.get(ParallelType::TIDy); | ||
| const bool thread_z = domains.get(ParallelType::TIDz); | ||
| const bool block_x = domains.get(ParallelType::BIDx); | ||
| const bool block_y = domains.get(ParallelType::BIDy); | ||
| const bool block_z = domains.get(ParallelType::BIDz); | ||
|
|
||
| const bool grid_broadcast_needed = block_x || block_y || block_z; | ||
| const bool block_broadcast_needed = thread_x || thread_y || thread_z; | ||
|
|
||
| TORCH_INTERNAL_ASSERT( | ||
|
There was a problem hiding this comment. Do we also have this check in There was a problem hiding this comment. Yes. It's checked in |
||
| !grid_broadcast_needed, "Parallel broadcast across blocks not supported"); | ||
|
|
||
| if (block_broadcast_needed) { | ||
| indent(); | ||
| os << "broadcast::blockBroadcast<"; | ||
| os << (thread_x ? "true" : "false") << ", "; | ||
| os << (thread_y ? "true" : "false") << ", "; | ||
| os << (thread_z ? "true" : "false"); | ||
| os << ">("; | ||
| handle(bop->out()); | ||
| os << ", "; | ||
| handle(bop->in()); | ||
| os << ");\n"; | ||
| } else { | ||
| indent(); | ||
| handle(bop->out()); | ||
| os << "\n"; | ||
| indent_size++; | ||
| indent(); | ||
| os << " = "; | ||
| handle(bop->in()); | ||
| indent_size--; | ||
| os << ";\n"; | ||
| } | ||
| } | ||
|
|
||
| void IRPrinter::handle(const ForLoop* fl) { | ||
|
|
@@ -640,6 +677,14 @@ void IRPrinter::printKernel( | |
| os << "}\n"; | ||
| } | ||
|
|
||
| const ThreadPredicateMap& IRPrinter::getThreadPredicateMap() { | ||
| if (thread_predicates_ == nullptr) { | ||
| Fusion* fusion = FusionGuard::getCurFusion(); | ||
| thread_predicates_ = std::make_unique<ThreadPredicateMap>(fusion); | ||
| } | ||
| return *thread_predicates_; | ||
| } | ||
|
|
||
| std::ostream& operator<<(std::ostream& os, const Statement* stmt) { | ||
| IRPrinter p(os); | ||
| p.handle(stmt); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we follow more closely to ReductionOp to first check if it's been lowered to figure out how we're going to print it?
It looks to me like you're going to print
broadcast::blockBroadcast<...even if it hasn't been lowered.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. That's right. Fixed.