From 0167186e131c99c37a0472da928c32d6443f3ca9 Mon Sep 17 00:00:00 2001 From: Marcos Maronas Date: Thu, 5 Sep 2024 03:34:47 -0700 Subject: [PATCH] Revert "[SPIR-V] Add W/A for readnone function parameter attribute (#7669)" This reverts commit f87204892e58d7ffe73e80edbb631603d51f6a7f. --- llvm-spirv/lib/SPIRV/SPIRVWriter.cpp | 5 +---- .../test/transcoding/builtin_function_readnone_attr.ll | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp b/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp index 8dba81c03b56d..67087ebac0d44 100644 --- a/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp +++ b/llvm-spirv/lib/SPIRV/SPIRVWriter.cpp @@ -917,10 +917,7 @@ SPIRVFunction *LLVMToSPIRVBase::transFunctionDecl(Function *F) { if (Attrs.hasParamAttr(ArgNo, Attribute::ReadOnly)) BA->addAttr(FunctionParameterAttributeNoWrite); if (Attrs.hasParamAttr(ArgNo, Attribute::ReadNone)) - // TODO: intel/llvm customization - // see https://github.com/intel/llvm/issues/7592 - // Need to return FunctionParameterAttributeNoReadWrite - BA->addAttr(FunctionParameterAttributeNoWrite); + BA->addAttr(FunctionParameterAttributeNoReadWrite); if (Attrs.hasParamAttr(ArgNo, Attribute::ZExt)) BA->addAttr(FunctionParameterAttributeZext); if (Attrs.hasParamAttr(ArgNo, Attribute::SExt)) diff --git a/llvm-spirv/test/transcoding/builtin_function_readnone_attr.ll b/llvm-spirv/test/transcoding/builtin_function_readnone_attr.ll index 89101fd2161f1..a8bedda5d2b0d 100644 --- a/llvm-spirv/test/transcoding/builtin_function_readnone_attr.ll +++ b/llvm-spirv/test/transcoding/builtin_function_readnone_attr.ll @@ -9,9 +9,9 @@ ; CHECK-SPIRV: Name [[#B:]] "b" ; CHECK-SPIRV: Decorate [[#A]] FuncParamAttr 5 ; CHECK-SPIRV: Decorate [[#A]] FuncParamAttr 6 -; CHECK-SPIRV: Decorate [[#B]] FuncParamAttr 5 +; CHECK-SPIRV: Decorate [[#B]] FuncParamAttr 7 -; CHECK-LLVM: {{.*}}void @test_builtin_readnone(ptr nocapture readonly %{{.*}}, ptr nocapture readonly %{{.*}}) +; CHECK-LLVM: {{.*}}void @test_builtin_readnone(ptr nocapture readonly %{{.*}}, ptr nocapture readnone %{{.*}}) target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target triple = "spir-unknown-unknown"