- Remove all builtin handling not needed for constant foldable builtin calls

- Address review feedback

Author: mmha

clang/include/clang/CIR/Dialect/IR/CIROps.td

@@ -1854,40 +1854,6 @@ def FuncOp : CIR_Op<"func", [
   let hasVerifier = 1;
 }
 
-//===----------------------------------------------------------------------===//
-// LLVMIntrinsicCallOp
-//===----------------------------------------------------------------------===//
-
-def LLVMIntrinsicCallOp : CIR_Op<"llvm.intrinsic"> {
-  let summary = "Call to llvm intrinsic functions that is not defined in CIR";
-  let description = [{
-    The `cir.llvm.intrinsic` operation represents a call-like expression which has
-    a return type and arguments that map directly to an llvm intrinsic.
-    It only records its own name (`intrinsic_name`).
-  }];
-
-  let results = (outs Optional<CIR_AnyType>:$result);
-  let arguments = (ins
-                   StrAttr:$intrinsic_name, Variadic<CIR_AnyType>:$arg_ops);
-
-  let skipDefaultBuilders = 1;
-
-  let assemblyFormat = [{
-    $intrinsic_name $arg_ops `:` functional-type($arg_ops, $result) attr-dict
-  }];
-
-  let builders = [
-    OpBuilder<(ins "mlir::StringAttr":$intrinsic_name, "mlir::Type":$resType,
-              CArg<"mlir::ValueRange", "{}">:$operands), [{
-      $_state.addAttribute("intrinsic_name", intrinsic_name);
-      $_state.addOperands(operands);
-      if (resType)
-        $_state.addTypes(resType);
-    }]>,
-  ];
-
-}
-
 //===----------------------------------------------------------------------===//
 // CallOp
 //===----------------------------------------------------------------------===//

clang/lib/CIR/CodeGen/CIRGenBuilder.cpp

@@ -42,15 +42,15 @@ mlir::Value CIRGenBuilderTy::getArrayElement(mlir::Location arrayLocBegin,
 cir::ConstantOp CIRGenBuilderTy::getConstInt(mlir::Location loc,
                                              llvm::APSInt intVal) {
   bool isSigned = intVal.isSigned();
-  auto width = intVal.getBitWidth();
+  unsigned width = intVal.getBitWidth();
   cir::IntType t = isSigned ? getSIntNTy(width) : getUIntNTy(width);
   return getConstInt(loc, t,
                      isSigned ? intVal.getSExtValue() : intVal.getZExtValue());
 }
 
 cir::ConstantOp CIRGenBuilderTy::getConstInt(mlir::Location loc,
                                              llvm::APInt intVal) {
-  auto width = intVal.getBitWidth();
+  unsigned width = intVal.getBitWidth();
   cir::IntType t = getUIntNTy(width);
   return getConstInt(loc, t, intVal.getZExtValue());
 }

clang/lib/CIR/CodeGen/CIRGenBuilder.h

@@ -15,6 +15,7 @@
 
 #include "clang/CIR/Dialect/Builder/CIRBaseBuilder.h"
 #include "clang/CIR/MissingFeatures.h"
+#include "llvm/ADT/APFloat.h"
 #include "llvm/ADT/STLExtras.h"
 
 namespace clang::CIRGen {
@@ -235,11 +236,28 @@ class CIRGenBuilderTy : public cir::CIRBaseBuilderTy {
 
   cir::ConstantOp getConstInt(mlir::Location loc, mlir::Type t, uint64_t c);
 
-  cir::ConstantOp getConstFP(mlir::Location loc, mlir::Type t,
-                             llvm::APFloat fpVal) {
-    assert((mlir::isa<cir::SingleType, cir::DoubleType>(t)) &&
-           "expected cir::SingleType or cir::DoubleType");
-    return create<cir::ConstantOp>(loc, getAttr<cir::FPAttr>(t, fpVal));
+  mlir::Type getFPType(llvm::fltSemantics const &sem) {
+    switch (llvm::APFloat::SemanticsToEnum(sem)) {
+    case llvm::APFloat::S_IEEEhalf:
+      return cir::FP16Type::get(getContext(), typeCache.FP16Ty);
+    case llvm::APFloat::S_BFloat:
+      return cir::BF16Type::get(getContext(), typeCache.BFloat16Ty);
+    case llvm::APFloat::S_IEEEsingle:
+      return cir::SingleType::get(getContext(), typeCache.FloatTy);
+    case llvm::APFloat::S_IEEEdouble:
+      return cir::DoubleType::get(getContext(), typeCache.DoubleTy);
+    case llvm::APFloat::S_IEEEquad:
+      return cir::FP128Type::get(getContext(), typeCache.FP128Ty);
+    case llvm::APFloat::S_x87DoubleExtended:
+      return cir::FP80Type::get(getContext(), typeCache.FP80Ty);
+    default:
+      llvm_unreachable("Unrecognized floating semantics");
+    }
+  }
+
+  cir::ConstantOp getConstFP(mlir::Location loc, llvm::APFloat fpVal) {
+    mlir::Type type = getFPType(fpVal.getSemantics());
+    return create<cir::ConstantOp>(loc, getAttr<cir::FPAttr>(type, fpVal));
   }
 
   bool isInt8Ty(mlir::Type i) {