Skip to content

Fix the ScatterD issue in predicated_tile_iterator #3278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pengpeng-yu wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −10
Open

Fix the ScatterD issue in predicated_tile_iterator #3278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 38 additions & 10 deletions include/cutlass/epilogue/threadblock/predicated_tile_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,12 +364,16 @@ class PredicatedTileIterator {
}

if (group + 1 < ThreadMap::Iterations::kGroup) {
byte_pointer += params_.increment_group;
if (!ScatterD) {
byte_pointer += params_.increment_group;
}
}
}

if (cluster + 1 < ThreadMap::Iterations::kCluster) {
byte_pointer += params_.increment_cluster;
if (!ScatterD) {
byte_pointer += params_.increment_cluster;
}
}
}
}
Expand Down Expand Up @@ -727,17 +731,29 @@ class PredicatedTileIterator {
int increment_row = state_[0] / ThreadMap::Count::kRow;
state_[0] = state_[0] % ThreadMap::Count::kRow;

byte_pointer_ += (params_.advance_row * increment);
store_byte_pointer_ += (params_.advance_row * increment);
if (!ScatterD) {
byte_pointer_ += (params_.advance_row * increment);
}

if (!ScatterD && !PermuteD) {
store_byte_pointer_ += (params_.advance_row * increment);
}

thread_start_row_ += (ThreadMap::Shape::kRow * increment);

// Group
state_[1] += increment_row;
int increment_group = state_[1] / ThreadMap::Count::kGroup;
state_[1] = state_[1] % ThreadMap::Count::kGroup;

byte_pointer_ += (params_.advance_group * increment_row);
store_byte_pointer_ += (params_.advance_group * increment_row);
if (!ScatterD) {
byte_pointer_ += (params_.advance_group * increment_row);
}

if (!ScatterD && !PermuteD) {
store_byte_pointer_ += (params_.advance_group * increment_row);
}

thread_start_row_ +=
(ThreadMap::Shape::kGroup - 1) *
ThreadMap::Shape::kRow *
Expand All @@ -750,8 +766,14 @@ class PredicatedTileIterator {
int increment_cluster = state_[2] / ThreadMap::Count::kCluster;
state_[2] = state_[2] % ThreadMap::Count::kCluster;

byte_pointer_ += (params_.advance_cluster * increment_group);
store_byte_pointer_ += (params_.advance_cluster * increment_group);
if (!ScatterD) {
byte_pointer_ += (params_.advance_cluster * increment_group);
}

if (!ScatterD && !PermuteD) {
store_byte_pointer_ += (params_.advance_cluster * increment_group);
}

thread_start_row_ +=
ThreadMap::Count::kGroup *
ThreadMap::Shape::kGroup *
Expand All @@ -760,8 +782,14 @@ class PredicatedTileIterator {
increment_group;

// Tile
byte_pointer_ += (params_.advance_tile * increment_cluster);
store_byte_pointer_ += (params_.advance_tile * increment_cluster);
if (!ScatterD) {
byte_pointer_ += (params_.advance_tile * increment_cluster);
}

if (!ScatterD && !PermuteD) {
store_byte_pointer_ += (params_.advance_tile * increment_cluster);
}

thread_start_row_ +=
ThreadMap::Shape::kGroup *
ThreadMap::Shape::kRow *
Expand Down