[MLIR][SPIRVToLLVM] Added conversion for SPIR-V comparison ops

Implemented `FComparePattern` and `IComparePattern` classes
that provide conversion of SPIR-V comparison ops (such as
`spv.FOrdGreaterThanEqual` and others) to LLVM dialect.
Also added tests in `comparison-ops-to-llvm.mlir`.

Differential Revision: https://reviews.llvm.org/D81487

Author: georgemitenkov

mlir/lib/Conversion/SPIRVToLLVM/ConvertSPIRVToLLVM.cpp

@@ -47,6 +47,50 @@ class DirectConversionPattern : public SPIRVToLLVMConversion<SPIRVOp> {
     return success();
   }
 };
+
+/// Converts SPIR-V floating-point comparisons to llvm.fcmp "predicate"
+template <typename SPIRVOp, LLVM::FCmpPredicate predicate>
+class FComparePattern : public SPIRVToLLVMConversion<SPIRVOp> {
+public:
+  using SPIRVToLLVMConversion<SPIRVOp>::SPIRVToLLVMConversion;
+
+  LogicalResult
+  matchAndRewrite(SPIRVOp operation, ArrayRef<Value> operands,
+                  ConversionPatternRewriter &rewriter) const override {
+
+    auto dstType = this->typeConverter.convertType(operation.getType());
+    if (!dstType)
+      return failure();
+
+    rewriter.template replaceOpWithNewOp<LLVM::FCmpOp>(
+        operation, dstType,
+        rewriter.getI64IntegerAttr(static_cast<int64_t>(predicate)),
+        operation.operand1(), operation.operand2());
+    return success();
+  }
+};
+
+/// Converts SPIR-V integer comparisons to llvm.icmp "predicate"
+template <typename SPIRVOp, LLVM::ICmpPredicate predicate>
+class IComparePattern : public SPIRVToLLVMConversion<SPIRVOp> {
+public:
+  using SPIRVToLLVMConversion<SPIRVOp>::SPIRVToLLVMConversion;
+
+  LogicalResult
+  matchAndRewrite(SPIRVOp operation, ArrayRef<Value> operands,
+                  ConversionPatternRewriter &rewriter) const override {
+
+    auto dstType = this->typeConverter.convertType(operation.getType());
+    if (!dstType)
+      return failure();
+
+    rewriter.template replaceOpWithNewOp<LLVM::ICmpOp>(
+        operation, dstType,
+        rewriter.getI64IntegerAttr(static_cast<int64_t>(predicate)),
+        operation.operand1(), operation.operand2());
+    return success();
+  }
+};
 } // namespace
 
 //===----------------------------------------------------------------------===//
@@ -56,19 +100,48 @@ class DirectConversionPattern : public SPIRVToLLVMConversion<SPIRVOp> {
 void mlir::populateSPIRVToLLVMConversionPatterns(
     MLIRContext *context, LLVMTypeConverter &typeConverter,
     OwningRewritePatternList &patterns) {
-  patterns.insert<DirectConversionPattern<spirv::IAddOp, LLVM::AddOp>,
-                  DirectConversionPattern<spirv::IMulOp, LLVM::MulOp>,
-                  DirectConversionPattern<spirv::ISubOp, LLVM::SubOp>,
-                  DirectConversionPattern<spirv::FAddOp, LLVM::FAddOp>,
-                  DirectConversionPattern<spirv::FNegateOp, LLVM::FNegOp>,
-                  DirectConversionPattern<spirv::FDivOp, LLVM::FDivOp>,
-                  DirectConversionPattern<spirv::FRemOp, LLVM::FRemOp>,
-                  DirectConversionPattern<spirv::FSubOp, LLVM::FSubOp>,
-                  DirectConversionPattern<spirv::UDivOp, LLVM::UDivOp>,
-                  DirectConversionPattern<spirv::SDivOp, LLVM::SDivOp>,
-                  DirectConversionPattern<spirv::SRemOp, LLVM::SRemOp>,
-                  DirectConversionPattern<spirv::BitwiseAndOp, LLVM::AndOp>,
-                  DirectConversionPattern<spirv::BitwiseOrOp, LLVM::OrOp>,
-                  DirectConversionPattern<spirv::BitwiseXorOp, LLVM::XOrOp>>(
+  patterns.insert<
+      // Arithmetic ops
+      DirectConversionPattern<spirv::IAddOp, LLVM::AddOp>,
+      DirectConversionPattern<spirv::IMulOp, LLVM::MulOp>,
+      DirectConversionPattern<spirv::ISubOp, LLVM::SubOp>,
+      DirectConversionPattern<spirv::FAddOp, LLVM::FAddOp>,
+      DirectConversionPattern<spirv::FDivOp, LLVM::FDivOp>,
+      DirectConversionPattern<spirv::FNegateOp, LLVM::FNegOp>,
+      DirectConversionPattern<spirv::FRemOp, LLVM::FRemOp>,
+      DirectConversionPattern<spirv::FSubOp, LLVM::FSubOp>,
+      DirectConversionPattern<spirv::SDivOp, LLVM::SDivOp>,
+      DirectConversionPattern<spirv::SRemOp, LLVM::SRemOp>,
+      DirectConversionPattern<spirv::UDivOp, LLVM::UDivOp>,
+
+      // Bitwise ops
+      DirectConversionPattern<spirv::BitwiseAndOp, LLVM::AndOp>,
+      DirectConversionPattern<spirv::BitwiseOrOp, LLVM::OrOp>,
+      DirectConversionPattern<spirv::BitwiseXorOp, LLVM::XOrOp>,
+
+      // Comparison ops
+      IComparePattern<spirv::IEqualOp, LLVM::ICmpPredicate::eq>,
+      IComparePattern<spirv::INotEqualOp, LLVM::ICmpPredicate::ne>,
+      FComparePattern<spirv::FOrdEqualOp, LLVM::FCmpPredicate::oeq>,
+      FComparePattern<spirv::FOrdGreaterThanOp, LLVM::FCmpPredicate::ogt>,
+      FComparePattern<spirv::FOrdGreaterThanEqualOp, LLVM::FCmpPredicate::oge>,
+      FComparePattern<spirv::FOrdLessThanEqualOp, LLVM::FCmpPredicate::ole>,
+      FComparePattern<spirv::FOrdLessThanOp, LLVM::FCmpPredicate::olt>,
+      FComparePattern<spirv::FOrdNotEqualOp, LLVM::FCmpPredicate::one>,
+      FComparePattern<spirv::FUnordEqualOp, LLVM::FCmpPredicate::ueq>,
+      FComparePattern<spirv::FUnordGreaterThanOp, LLVM::FCmpPredicate::ugt>,
+      FComparePattern<spirv::FUnordGreaterThanEqualOp,
+                      LLVM::FCmpPredicate::uge>,
+      FComparePattern<spirv::FUnordLessThanEqualOp, LLVM::FCmpPredicate::ule>,
+      FComparePattern<spirv::FUnordLessThanOp, LLVM::FCmpPredicate::ult>,
+      FComparePattern<spirv::FUnordNotEqualOp, LLVM::FCmpPredicate::une>,
+      IComparePattern<spirv::SGreaterThanOp, LLVM::ICmpPredicate::sgt>,
+      IComparePattern<spirv::SGreaterThanEqualOp, LLVM::ICmpPredicate::sge>,
+      IComparePattern<spirv::SLessThanEqualOp, LLVM::ICmpPredicate::sle>,
+      IComparePattern<spirv::SLessThanOp, LLVM::ICmpPredicate::slt>,
+      IComparePattern<spirv::UGreaterThanOp, LLVM::ICmpPredicate::ugt>,
+      IComparePattern<spirv::UGreaterThanEqualOp, LLVM::ICmpPredicate::uge>,
+      IComparePattern<spirv::ULessThanEqualOp, LLVM::ICmpPredicate::ule>,
+      IComparePattern<spirv::ULessThanOp, LLVM::ICmpPredicate::ult>>(
       context, typeConverter);
 }