Skip to content

Commit a29bcd6

Browse files
authored
[SPIR-V] Revert "[SPIR-V] Add W/A for readnone function parameter attribute (#7669)" (#15298)
This reverts commit f872048.
1 parent dba4b3f commit a29bcd6

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

llvm-spirv/lib/SPIRV/SPIRVWriter.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -917,10 +917,7 @@ SPIRVFunction *LLVMToSPIRVBase::transFunctionDecl(Function *F) {
917917
if (Attrs.hasParamAttr(ArgNo, Attribute::ReadOnly))
918918
BA->addAttr(FunctionParameterAttributeNoWrite);
919919
if (Attrs.hasParamAttr(ArgNo, Attribute::ReadNone))
920-
// TODO: intel/llvm customization
921-
// see https://github.com/intel/llvm/issues/7592
922-
// Need to return FunctionParameterAttributeNoReadWrite
923-
BA->addAttr(FunctionParameterAttributeNoWrite);
920+
BA->addAttr(FunctionParameterAttributeNoReadWrite);
924921
if (Attrs.hasParamAttr(ArgNo, Attribute::ZExt))
925922
BA->addAttr(FunctionParameterAttributeZext);
926923
if (Attrs.hasParamAttr(ArgNo, Attribute::SExt))

llvm-spirv/test/transcoding/builtin_function_readnone_attr.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
; CHECK-SPIRV: Name [[#B:]] "b"
1010
; CHECK-SPIRV: Decorate [[#A]] FuncParamAttr 5
1111
; CHECK-SPIRV: Decorate [[#A]] FuncParamAttr 6
12-
; CHECK-SPIRV: Decorate [[#B]] FuncParamAttr 5
12+
; CHECK-SPIRV: Decorate [[#B]] FuncParamAttr 7
1313

14-
; CHECK-LLVM: {{.*}}void @test_builtin_readnone(ptr nocapture readonly %{{.*}}, ptr nocapture readonly %{{.*}})
14+
; CHECK-LLVM: {{.*}}void @test_builtin_readnone(ptr nocapture readonly %{{.*}}, ptr nocapture readnone %{{.*}})
1515

1616
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
1717
target triple = "spir-unknown-unknown"

0 commit comments

Comments
 (0)