squall/cutlass
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix epilogue iterator error (#995)

Browse Source 
* fix epilogue iterator error

* fix epilogue iterator error

---------

Co-authored-by: maxiao <maxiao@cowarobot.com>
This commit is contained in:
ChangyouSiom 2023-07-11 09:30:31 +08:00 committed by GitHub
parent 9b923dd4c4
commit e066ced33b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/cutlass/epilogue/threadblock/predicated_tile_iterator.h
View File

@ -440,12 +440,16 @@ public:
} }
if (group + 1 < ThreadMap::Iterations::kGroup) { if (group + 1 < ThreadMap::Iterations::kGroup) {
byte_pointer += params_.increment_group; if (!ScatterD && !PermuteD) {
byte_pointer += params_.increment_group;
}
} }
} }
if (cluster + 1 < ThreadMap::Iterations::kCluster) { if (cluster + 1 < ThreadMap::Iterations::kCluster) {
byte_pointer += params_.increment_cluster; if (!ScatterD && !PermuteD) {
byte_pointer += params_.increment_cluster;
}
} }
} }
} }
@ -650,8 +654,12 @@ public:
state_[0] = 0; state_[0] = 0;
++state_[1]; ++state_[1];
byte_pointer_ += params_.advance_group; if (!ScatterD) {
store_byte_pointer_ += params_.advance_group; byte_pointer_ += params_.advance_group;
}
if (!ScatterD && !PermuteD) {
store_byte_pointer_ += params_.advance_group;
}
thread_start_row_ += (ThreadMap::Shape::kGroup - 1) * thread_start_row_ += (ThreadMap::Shape::kGroup - 1) *
ThreadMap::Shape::kRow * ThreadMap::Count::kRow; ThreadMap::Shape::kRow * ThreadMap::Count::kRow;
@ -660,16 +668,24 @@ public:
state_[1] = 0; state_[1] = 0;
++state_[2]; ++state_[2];
byte_pointer_ += params_.advance_cluster; if (!ScatterD) {
store_byte_pointer_ += params_.advance_cluster; byte_pointer_ += params_.advance_cluster;
}
if (!ScatterD && !PermuteD) {
store_byte_pointer_ += params_.advance_cluster;
}
thread_start_row_ += ThreadMap::Count::kGroup * thread_start_row_ += ThreadMap::Count::kGroup *
ThreadMap::Shape::kGroup * ThreadMap::Count::kRow * ThreadMap::Shape::kRow; ThreadMap::Shape::kGroup * ThreadMap::Count::kRow * ThreadMap::Shape::kRow;
if (state_[2] == ThreadMap::Count::kCluster) { if (state_[2] == ThreadMap::Count::kCluster) {
state_[2] = 0; state_[2] = 0;
byte_pointer_ += params_.advance_tile; if (!ScatterD) {
store_byte_pointer_ += params_.advance_tile; byte_pointer_ += params_.advance_tile;
}
if (!ScatterD && !PermuteD) {
store_byte_pointer_ += params_.advance_tile;
}
thread_start_row_ += ThreadMap::Shape::kGroup * ThreadMap::Shape::kRow thread_start_row_ += ThreadMap::Shape::kGroup * ThreadMap::Shape::kRow
* ThreadMap::Shape::kCluster * ThreadMap::Shape::kTile; * ThreadMap::Shape::kCluster * ThreadMap::Shape::kTile;