[spirv-ll] Fix a bug in s_mad24 translation

We weren't correctly forcing a signed interpretation of the operands. This showed up when the operands were `OpTypeInt` with the 'signedness' bit set to 0.
uxlfoundation · Nov 9, 2023 · c1f8da5 · c1f8da5
1 parent efb96c3
commit c1f8da5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/modules/compiler/spirv-ll/source/builder.cpp b/modules/compiler/spirv-ll/source/builder.cpp
@@ -912,6 +912,7 @@ llvm::Value *spirv_ll::Builder::createOCLBuiltinCall(
     case OpenCLLIB::SMul_hi:
     case OpenCLLIB::SSub_sat:
     case OpenCLLIB::SMul24:
+    case OpenCLLIB::SMad24:
       resMangleInfo = MangleInfo::getSigned(resTyId);
       for (auto &arg : argInfo) {
         arg.forceSign = MangleInfo::ForceSignInfo::ForceSigned;

diff --git a/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_i32.spvasm b/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_i32.spvasm
@@ -25,7 +25,7 @@
 
 ; All types, variables and constants
               %void_t = OpTypeVoid
-               %i32_t = OpTypeInt 32 1
+               %i32_t = OpTypeInt 32 0
         %s_mad24_fn_t = OpTypeFunction %void_t
                %i32_1 = OpConstant %i32_t 1
                %i32_2 = OpConstant %i32_t 2

diff --git a/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v16i32.spvasm b/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v16i32.spvasm
@@ -26,7 +26,7 @@
 
 ; All types, variables and constants
               %void_t = OpTypeVoid
-               %i32_t = OpTypeInt 32 1
+               %i32_t = OpTypeInt 32 0
             %v16i32_t = OpTypeVector %i32_t 16
         %s_mad24_fn_t = OpTypeFunction %void_t
                %i32_1 = OpConstant %i32_t 1

diff --git a/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v2i32.spvasm b/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v2i32.spvasm
@@ -25,7 +25,7 @@
 
 ; All types, variables and constants
               %void_t = OpTypeVoid
-               %i32_t = OpTypeInt 32 1
+               %i32_t = OpTypeInt 32 0
              %v2i32_t = OpTypeVector %i32_t 2
         %s_mad24_fn_t = OpTypeFunction %void_t
                %i32_1 = OpConstant %i32_t 1

diff --git a/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v3i32.spvasm b/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v3i32.spvasm
@@ -25,7 +25,7 @@
 
 ; All types, variables and constants
               %void_t = OpTypeVoid
-               %i32_t = OpTypeInt 32 1
+               %i32_t = OpTypeInt 32 0
              %v3i32_t = OpTypeVector %i32_t 3
         %s_mad24_fn_t = OpTypeFunction %void_t
                %i32_1 = OpConstant %i32_t 1

diff --git a/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v4i32.spvasm b/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v4i32.spvasm
@@ -25,7 +25,7 @@
 
 ; All types, variables and constants
               %void_t = OpTypeVoid
-               %i32_t = OpTypeInt 32 1
+               %i32_t = OpTypeInt 32 0
              %v4i32_t = OpTypeVector %i32_t 4
         %s_mad24_fn_t = OpTypeFunction %void_t
                %i32_1 = OpConstant %i32_t 1

diff --git a/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v8i32.spvasm b/modules/compiler/spirv-ll/test/spvasm/op_opencl_s_mad24_v8i32.spvasm
@@ -26,7 +26,7 @@
 
 ; All types, variables and constants
               %void_t = OpTypeVoid
-               %i32_t = OpTypeInt 32 1
+               %i32_t = OpTypeInt 32 0
              %v8i32_t = OpTypeVector %i32_t 8
         %s_mad24_fn_t = OpTypeFunction %void_t
                %i32_1 = OpConstant %i32_t 1