[PATCH] D159227: [SPIRV] Fix bug in emitting GLSL ext inst names

[Natalie Chouinard via Phabricator via llvm-commits]

sudonatalie created this revision.
Herald added subscribers: pmatos, ThomasRaoux, hiraditya, Anastasia.
Herald added a project: All.
sudonatalie published this revision for review.
sudonatalie added reviewers: mpaszkowski, Keenuts.
Herald added a reviewer: zuban32.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Lookup extended instruction numbers in the given instruction set so that
correct names are now emitted for GLSL.std.450 instructions as well as
OpenCL.std.

Add a single test to verify correct abs intrinsic names are emitted when
targetting logical SPIR-V.

Depends on D156424 <https://reviews.llvm.org/D156424>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D159227

Files:
  llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
  llvm/test/CodeGen/SPIRV/hlsl-intrinsics/abs.ll


Index: llvm/test/CodeGen/SPIRV/hlsl-intrinsics/abs.ll
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/SPIRV/hlsl-intrinsics/abs.ll
@@ -0,0 +1,27 @@
+; RUN: llc -O0 -mtriple=spirv-unknown-linux %s -o - | FileCheck %s
+
+; CHECK: OpExtInstImport "GLSL.std.450"
+
+define void @main() #1 {
+entry:
+  %i = alloca i32, align 4
+  %absi = alloca i32, align 4
+  %f = alloca float, align 4
+  %absf = alloca float, align 4
+  %0 = load i32, ptr %i, align 4
+
+; CHECK: %[[#]] = OpExtInst %[[#]] %[[#]] SAbs %[[#]]
+  %elt.abs = call i32 @llvm.abs.i32(i32 %0, i1 false)
+
+  store i32 %elt.abs, ptr %absi, align 4
+  %1 = load float, ptr %f, align 4
+
+; CHECK: %[[#]] = OpExtInst %[[#]] %[[#]] FAbs %[[#]]
+  %elt.abs1 = call float @llvm.fabs.f32(float %1)
+
+  store float %elt.abs1, ptr %absf, align 4
+  ret void
+}
+
+declare i32 @llvm.abs.i32(i32, i1 immarg) #2
+declare float @llvm.fabs.f32(float) #2
Index: llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
===================================================================
--- llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
+++ llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVBaseInfo.cpp
@@ -199,8 +199,7 @@
 std::string getExtInstName(SPIRV::InstructionSet::InstructionSet Set,
                            uint32_t InstructionNumber) {
   const SPIRV::ExtendedBuiltin *Lookup =
-      SPIRV::lookupExtendedBuiltinBySetAndNumber(
-          SPIRV::InstructionSet::OpenCL_std, InstructionNumber);
+      SPIRV::lookupExtendedBuiltinBySetAndNumber(Set, InstructionNumber);
 
   if (!Lookup)
     return "UNKNOWN_EXT_INST";


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D159227.554829.patch
Type: text/x-patch
Size: 1632 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230830/1bf25ff5/attachment.bin>