Fix CI failures

KhronosGroup · Jan 18, 2024 · 8eedb5a · 8eedb5a
1 parent c6b3427
commit 8eedb5a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
@@ -3969,8 +3969,9 @@ SPIRVValue *LLVMToSPIRVBase::transIntrinsicInst(IntrinsicInst *II,
     SPIRVTypePointer *ITy = static_cast<SPIRVTypePointer *>(transPointerType(
         II->getType()->getStructElementType(1), SPIRAS_Private));
 
-    assert(ITy->getElementType()->getBitWidth() == 32 &&
-           "Unexpected integer width in @llvm.frexp instrinsic");
+    unsigned BitWidth = ITy->getElementType()->getBitWidth();
+    BM->getErrorLog().checkError(BitWidth == 32, SPIRVEC_InvalidBitWidth,
+                                 std::to_string(BitWidth));
 
     SPIRVValue *IntVal =
         BM->addVariable(ITy, false, spv::internal::LinkageTypeInternal, nullptr,

diff --git a/test/llvm-intrinsics/frexp.ll b/test/llvm-intrinsics/frexp.ll
@@ -59,9 +59,9 @@ declare { <2 x double>, <2 x i32> } @llvm.frexp.v2f64.v2i32(<2 x double>)
 ; CHECK-LLVM: %[[Frexp:[a-z0-9]+]] = call spir_func float @_Z5frexpfPi(float -0.000000e+00, ptr %[[#IntVar]])
 ; CHECK-LLVM: %[[#LoadIntVar:]] = load i32, ptr %[[#IntVar]]
 ; CHECK-LLVM: %[[#AllocaStrFloatInt:]] = alloca %[[StrTypeFloatInt]]
-; CHECK-LLVM: %[[GEPFloat:[a-z0-9]+]] = getelementptr inbounds float, ptr %[[#AllocaStrFloatInt]], i32 0
+; CHECK-LLVM: %[[GEPFloat:[a-z0-9]+]] = getelementptr inbounds %structtype, ptr %[[#AllocaStrFloatInt]], i32 0, i32 0
 ; CHECK-LLVM: store float %[[Frexp]], ptr %[[GEPFloat]]
-; CHECK-LLVM: %[[GEPInt:[a-z0-9]+]] = getelementptr inbounds i32, ptr %[[#AllocaStrFloatInt]], i32 1
+; CHECK-LLVM: %[[GEPInt:[a-z0-9]+]] = getelementptr inbounds %structtype, ptr %[[#AllocaStrFloatInt]], i32 0, i32 1
 ; CHECK-LLVM: store i32 %[[#LoadIntVar]], ptr %[[GEPInt]]
 ; CHECK-LLVM: %[[LoadStrFloatInt:[a-z0-9]+]] = load %[[StrTypeFloatInt]], ptr %[[#AllocaStrFloatInt]]
 ; CHECK-LLVM: ret %[[StrTypeFloatInt]] %[[LoadStrFloatInt]]
@@ -110,9 +110,9 @@ define { <4 x float>, <4 x i32> } @frexp_nonsplat_vector() {
 ; CHECK-LLVM: %[[Frexp1:[a-z0-9.]+]] = call spir_func float @_Z5frexpfPi(float %[[Frexp0]], ptr %[[#IntVar2]])
 ; CHECK-LLVM: %[[#LoadIntVar:]] = load i32, ptr %[[#IntVar2]]
 ; CHECK-LLVM: %[[#AllocaStrFloatInt:]] = alloca %[[StrTypeFloatInt]]
-; CHECK-LLVM: %[[GEPFloat:[a-z0-9]+]] = getelementptr inbounds float, ptr %[[#AllocaStrFloatInt]], i32 0
+; CHECK-LLVM: %[[GEPFloat:[a-z0-9]+]] = getelementptr inbounds %structtype, ptr %[[#AllocaStrFloatInt]], i32 0, i32 0
 ; CHECK-LLVM: store float %[[Frexp1]], ptr %[[GEPFloat]]
-; CHECK-LLVM: %[[GEPInt:[a-z0-9]+]] = getelementptr inbounds i32, ptr %[[#AllocaStrFloatInt]], i32 1
+; CHECK-LLVM: %[[GEPInt:[a-z0-9]+]] = getelementptr inbounds %structtype, ptr %[[#AllocaStrFloatInt]], i32 0, i32 1
 ; CHECK-LLVM: store i32 %[[#LoadIntVar]], ptr %[[GEPInt]]
 ; CHECK-LLVM: %[[LoadStrFloatInt:[a-z0-9]+]] = load %[[StrTypeFloatInt]], ptr %[[#AllocaStrFloatInt]]
 ; CHECK-LLVM: ret %[[StrTypeFloatInt]] %[[LoadStrFloatInt]]

diff --git a/test/negative/frexp_unsupported_signature.ll b/test/negative/frexp_unsupported_signature.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as %s -o %t.bc
-; RUN: not --crash llvm-spirv %t.bc 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
+; RUN: not llvm-spirv %t.bc 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
 
-; CHECK-ERROR: Assertion `ITy->getElementType()->getBitWidth() == 32 && "Unexpected integer width in @llvm.frexp instrinsic"' failed
+; CHECK-ERROR: InvalidBitWidth: Invalid bit width in input: 16
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024"
 target triple = "spir64-unknown-unknown"