Clean up translation of islessgreater() and OpLessOrGreater

StuartDBrady · vmaksimo · commit be3ac5cf8c52 · 2021-09-28T14:28:04.000+03:00
Translate islessgreater() to OpFOrdNotEqual instead of OpLessOrGreater, which is deprecated as of SPIR-V 1.5 revision 2, and has identical semantics. Translate OpLessOrGreater to 'fcmp one' instead of islessgreater(), which has identical semantics. Original commit: KhronosGroup/SPIRV-LLVM-Translator@08884df
diff --git a/llvm-spirv/lib/SPIRV/OCLUtil.cpp b/llvm-spirv/lib/SPIRV/OCLUtil.cpp
@@ -293,7 +293,7 @@ template <> void SPIRVMap<std::string, Op, SPIRVInstruction>::init() {
   _SPIRV_OP(isgreaterequal, FOrdGreaterThanEqual)
   _SPIRV_OP(isless, FOrdLessThan)
   _SPIRV_OP(islessequal, FOrdLessThanEqual)
-  _SPIRV_OP(islessgreater, LessOrGreater)
+  _SPIRV_OP(islessgreater, FOrdNotEqual)
   _SPIRV_OP(isordered, Ordered)
   _SPIRV_OP(isunordered, Unordered)
   _SPIRV_OP(isfinite, IsFinite)
diff --git a/llvm-spirv/lib/SPIRV/SPIRVReader.cpp b/llvm-spirv/lib/SPIRV/SPIRVReader.cpp
@@ -598,11 +598,6 @@ SPIRVToLLVM::transValue(const std::vector<SPIRVValue *> &BV, Function *F,
   return V;
 }
 
-bool SPIRVToLLVM::isSPIRVCmpInstTransToLLVMInst(SPIRVInstruction *BI) const {
-  auto OC = BI->getOpCode();
-  return isCmpOpCode(OC) && OC != OpLessOrGreater;
-}
-
 void SPIRVToLLVM::setName(llvm::Value *V, SPIRVValue *BV) {
   auto Name = BV->getName();
   if (!Name.empty() && (!V->hasName() || Name != V->getName()))
@@ -1114,6 +1109,9 @@ Value *SPIRVToLLVM::transCmpInst(SPIRVValue *BV, BasicBlock *BB, Function *F) {
     Builder.SetInsertPoint(BB);
   }
 
+  if (OP == OpLessOrGreater)
+    OP = OpFOrdNotEqual;
+
   if (BT->isTypeVectorOrScalarInt() || BT->isTypeVectorOrScalarBool() ||
       BT->isTypePointer())
     Inst = Builder.CreateICmp(CmpMap::rmap(OP), Op0, Op1);
@@ -2491,7 +2489,7 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
 
   default: {
     auto OC = BV->getOpCode();
-    if (isSPIRVCmpInstTransToLLVMInst(static_cast<SPIRVInstruction *>(BV)))
+    if (isCmpOpCode(OC))
       return mapValue(BV, transCmpInst(BV, BB, F));
 
     if (OCLSPIRVBuiltinMap::rfind(OC, nullptr))
diff --git a/llvm-spirv/lib/SPIRV/SPIRVReader.h b/llvm-spirv/lib/SPIRV/SPIRVReader.h
@@ -194,7 +194,6 @@ class SPIRVToLLVM {
     return BuiltInConstFunc.count(Name);
   }
 
-  bool isSPIRVCmpInstTransToLLVMInst(SPIRVInstruction *BI) const;
   bool isDirectlyTranslatedToOCL(Op OpCode) const;
   MDString *transOCLKernelArgTypeName(SPIRVFunctionParameter *);
   Value *mapFunction(SPIRVFunction *BF, Function *F);
diff --git a/llvm-spirv/test/transcoding/relationals_float.ll b/llvm-spirv/test/transcoding/relationals_float.ll
@@ -11,15 +11,15 @@
 ; CHECK-LLVM: call spir_func i32 @_Z5isinff(
 ; CHECK-LLVM: call spir_func i32 @_Z8isnormalf(
 ; CHECK-LLVM: call spir_func i32 @_Z7signbitf(
-; CHECK-LLVM: call spir_func i32 @_Z13islessgreaterff(
+; CHECK-LLVM: fcmp one float
 ; CHECK-LLVM: fcmp ord float
 ; CHECK-LLVM: fcmp uno float
 
 ; CHECK-LLVM: call spir_func <2 x i32> @_Z8isfiniteDv2_f(
 ; CHECK-LLVM: call spir_func <2 x i32> @_Z5isnanDv2_f(
 ; CHECK-LLVM: call spir_func <2 x i32> @_Z5isinfDv2_f(
 ; CHECK-LLVM: call spir_func <2 x i32> @_Z8isnormalDv2_f(
-; CHECK-LLVM: call spir_func <2 x i32> @_Z13islessgreaterDv2_fS_(
+; CHECK-LLVM: fcmp one <2 x float>
 ; CHECK-LLVM: fcmp ord <2 x float>
 ; CHECK-LLVM: fcmp uno <2 x float>
 
@@ -31,15 +31,15 @@
 ; CHECK-SPIRV: 4 IsInf [[BoolTypeID]]
 ; CHECK-SPIRV: 4 IsNormal [[BoolTypeID]]
 ; CHECK-SPIRV: 4 SignBitSet [[BoolTypeID]]
-; CHECK-SPIRV: 5 LessOrGreater [[BoolTypeID]]
+; CHECK-SPIRV: 5 FOrdNotEqual [[BoolTypeID]]
 ; CHECK-SPIRV: 5 Ordered [[BoolTypeID]]
 ; CHECK-SPIRV: 5 Unordered [[BoolTypeID]]
 
 ; CHECK-SPIRV: 4 IsFinite [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 4 IsNan [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 4 IsInf [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 4 IsNormal [[BoolVectorTypeID]]
-; CHECK-SPIRV: 5 LessOrGreater [[BoolVectorTypeID]]
+; CHECK-SPIRV: 5 FOrdNotEqual [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 5 Ordered [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 5 Unordered [[BoolVectorTypeID]]
 
diff --git a/llvm-spirv/test/transcoding/relationals_half.ll b/llvm-spirv/test/transcoding/relationals_half.ll
@@ -11,15 +11,15 @@
 ; CHECK-LLVM: call spir_func i32 @_Z5isinfDh(
 ; CHECK-LLVM: call spir_func i32 @_Z8isnormalDh(
 ; CHECK-LLVM: call spir_func i32 @_Z7signbitDh(
-; CHECK-LLVM: call spir_func i32 @_Z13islessgreaterDhDh(
+; CHECK-LLVM: fcmp one half
 ; CHECK-LLVM: fcmp ord half
 ; CHECK-LLVM: fcmp uno half
 
 ; CHECK-LLVM: call spir_func <2 x i16> @_Z8isfiniteDv2_Dh(
 ; CHECK-LLVM: call spir_func <2 x i16> @_Z5isnanDv2_Dh(
 ; CHECK-LLVM: call spir_func <2 x i16> @_Z5isinfDv2_Dh(
 ; CHECK-LLVM: call spir_func <2 x i16> @_Z8isnormalDv2_Dh(
-; CHECK-LLVM: call spir_func <2 x i16> @_Z13islessgreaterDv2_DhS_(
+; CHECK-LLVM: fcmp one <2 x half>
 ; CHECK-LLVM: fcmp ord <2 x half>
 ; CHECK-LLVM: fcmp uno <2 x half>
 
@@ -31,15 +31,15 @@
 ; CHECK-SPIRV: 4 IsInf [[BoolTypeID]]
 ; CHECK-SPIRV: 4 IsNormal [[BoolTypeID]]
 ; CHECK-SPIRV: 4 SignBitSet [[BoolTypeID]]
-; CHECK-SPIRV: 5 LessOrGreater [[BoolTypeID]]
+; CHECK-SPIRV: 5 FOrdNotEqual [[BoolTypeID]]
 ; CHECK-SPIRV: 5 Ordered [[BoolTypeID]]
 ; CHECK-SPIRV: 5 Unordered [[BoolTypeID]]
 
 ; CHECK-SPIRV: 4 IsFinite [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 4 IsNan [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 4 IsInf [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 4 IsNormal [[BoolVectorTypeID]]
-; CHECK-SPIRV: 5 LessOrGreater [[BoolVectorTypeID]]
+; CHECK-SPIRV: 5 FOrdNotEqual [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 5 Ordered [[BoolVectorTypeID]]
 ; CHECK-SPIRV: 5 Unordered [[BoolVectorTypeID]]
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,6 @@ class SPIRVToLLVM {`
`194`	`194`	`return BuiltInConstFunc.count(Name);`
`195`	`195`	`}`
`196`	`196`
`197`		`- bool isSPIRVCmpInstTransToLLVMInst(SPIRVInstruction *BI) const;`
`198`	`197`	`bool isDirectlyTranslatedToOCL(Op OpCode) const;`
`199`	`198`	`MDString transOCLKernelArgTypeName(SPIRVFunctionParameter );`
`200`	`199`	`Value mapFunction(SPIRVFunction BF, Function *F);`