Skip to content

change stride to 4 instead of 1 if int8 is not supported #1397

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

Merged
merged 6 commits into from
Sep 24, 2024
Merged

change stride to 4 instead of 1 if int8 is not supported #1397

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68fcec9
change stride to 2 instead of 1 if int8 is not supported
Rekt3421 Sep 12, 2024
ea8e346
add unit test
Rekt3421 Sep 16, 2024
92caeb5
add EOF line
Rekt3421 Sep 16, 2024
e2a9bca
add second unit test from the issue
Rekt3421 Sep 16, 2024
ce8775a
use func
Rekt3421 Sep 23, 2024
0fe6a7a
fix comment
Rekt3421 Sep 23, 2024
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
14 changes: 11 additions & 3 deletions lib/SPIRVProducerPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,13 @@ struct SPIRVProducerPassImpl {
return false;
}

uint32_t getCorrectedStride(uint32_t CurrStride) {
if (CurrStride == 1 && !Int8Support()) {
return 4;
}
return CurrStride;
}

//
// Primary interface for adding SPIRVInstructions to a SPIRVSection.
template <enum SPIRVSection TSection = kFunctions>
Expand Down Expand Up @@ -2084,8 +2091,10 @@ SPIRVID SPIRVProducerPassImpl::getSPIRVType(Type *Ty, bool needs_layout) {
// Ops[2] = Stride Number(Literal Number)
Ops.clear();

// if stride is 1 automatically set it to 2 to avoid stride issues.
auto CurrStride = static_cast<uint32_t>(GetTypeAllocSize(EleTy, DL));
Ops << RID << spv::DecorationArrayStride
<< static_cast<uint32_t>(GetTypeAllocSize(EleTy, DL));
<< getCorrectedStride(CurrStride);

addSPIRVInst<kAnnotations>(spv::OpDecorate, Ops);
}
Expand Down Expand Up @@ -6005,8 +6014,7 @@ void SPIRVProducerPassImpl::HandleDeferredDecorations() {
// Ops[1] = Decoration (ArrayStride)
// Ops[2] = Stride number (Literal Number)
SPIRVOperandVec Ops;

Ops << id << spv::DecorationArrayStride << stride;
Ops << id << spv::DecorationArrayStride << getCorrectedStride(stride);

addSPIRVInst<kAnnotations>(spv::OpDecorate, Ops);
}
Expand Down
17 changes: 17 additions & 0 deletions test/correct_stride_int8_not_supported.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// RUN: clspv -int8=0 %target %s -o %t.spv
// RUN: spirv-dis -o %t2.spvasm %t.spv
// RUN: FileCheck %s < %t2.spvasm
// RUN: spirv-val --target-env vulkan1.0 %t.spv

constant uchar b[4] = {[0]=42, [1]=13, [2]=0, [3]=5};

void kernel __attribute__((reqd_work_group_size(4, 1, 1))) foo(global uchar* a)
{
*a = b[get_local_id(0)];
}

// CHECK-DAG: [[uint:%[^ ]+]] = OpTypeInt 32 0
// CHECK-DAG: OpTypePointer StorageBuffer [[struct:%[^ ]+]]
// CHECK-DAG: [[struct]] = OpTypeStruct [[runtimearr:%[^ ]+]]
// CHECK-DAG: OpDecorate [[runtimearr]] ArrayStride 4

26 changes: 26 additions & 0 deletions test/correct_stride_int8_not_supported_char_arr.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// RUN: clspv -int8=0 %target %s -o %t.spv
// RUN: spirv-dis -o %t2.spvasm %t.spv
// RUN: FileCheck %s < %t2.spvasm
// RUN: spirv-val --target-env vulkan1.0 %t.spv

__kernel void helloWorld(__global char* data){
data[0] = 'H';
data[1] = 'e';
data[2] = 'l';
data[3] = 'l';
data[4] = 'o';
data[5] = ' ';
data[6] = 'W';
data[7] = 'o';
data[8] = 'r';
data[9] = 'l';
data[10] = 'd';
data[11] = '!';
data[12] = '\n';
data[13] = 0;
}

// CHECK-DAG: [[uint:%[^ ]+]] = OpTypeInt 32 0
// CHECK-DAG: OpTypePointer StorageBuffer [[struct:%[^ ]+]]
// CHECK-DAG: [[struct]] = OpTypeStruct [[runtimearr:%[^ ]+]]
// CHECK-DAG: OpDecorate [[runtimearr]] ArrayStride 4