formatting + refactor

Author: HendrikHuebner

clang/lib/CIR/CodeGen/CIRGenBuiltinX86.cpp

@@ -26,13 +26,16 @@ static int64_t getIntValueFromConstOp(mlir::Value val) {
   return val.getDefiningOp<cir::ConstantOp>().getIntValue().getSExtValue();
 }
 
-static mlir::Value emitClFlush(CIRGenFunction &cgf, const CallExpr *e,
-                               mlir::Value &op) {
-  mlir::Type voidTy = cir::VoidType::get(&cgf.getMLIRContext());
+template <typename... Operands>
+static mlir::Value emitIntrinsicCallOp(CIRGenFunction &cgf, const CallExpr *e,
+                                       const std::string &str,
+                                       const mlir::Type &resTy,
+                                       Operands &&...op) {
+  CIRGenBuilderTy &builder = cgf.getBuilder();
   mlir::Location location = cgf.getLoc(e->getExprLoc());
-  return cir::LLVMIntrinsicCallOp::create(
-             cgf.getBuilder(), location,
-             cgf.getBuilder().getStringAttr("x86.sse2.clflush"), voidTy, op)
+  return cir::LLVMIntrinsicCallOp::create(builder, location,
+                                          builder.getStringAttr(str), resTy,
+                                          std::forward<Operands>(op)...)
       .getResult();
 }
 
@@ -46,10 +49,8 @@ static mlir::Value emitPrefetch(CIRGenFunction &cgf, const CallExpr *e,
   mlir::Value locality = builder.getSignedInt(location, hint & 0x3, 32);
   mlir::Value data = builder.getSignedInt(location, 1, 32);
 
-  return cir::LLVMIntrinsicCallOp::create(
-             builder, location, builder.getStringAttr("prefetch"), voidTy,
-             mlir::ValueRange{address, rw, locality, data})
-      .getResult();
+  return emitIntrinsicCallOp(cgf, e, "prefetch", voidTy,
+                             mlir::ValueRange{address, rw, locality, data});
 }
 
 mlir::Value CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID,
@@ -89,17 +90,24 @@ mlir::Value CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID,
     ops.push_back(emitScalarOrConstFoldImmArg(iceArguments, i, e));
   }
 
+  CIRGenBuilderTy &builder = getBuilder();
+  mlir::Type voidTy = builder.getVoidTy();
+
   switch (builtinID) {
   default:
     return {};
   case X86::BI_mm_prefetch:
     return emitPrefetch(*this, e, ops[0], getIntValueFromConstOp(ops[1]));
   case X86::BI_mm_clflush:
-    return emitClFlush(*this, e, ops[0]);
+    return emitIntrinsicCallOp(*this, e, "x86.sse2.clflush", voidTy, ops[0]);
   case X86::BI_mm_lfence:
+    return emitIntrinsicCallOp(*this, e, "x86.sse2.lfence", voidTy);
   case X86::BI_mm_pause:
+    return emitIntrinsicCallOp(*this, e, "x86.sse2.pause", voidTy);
   case X86::BI_mm_mfence:
+    return emitIntrinsicCallOp(*this, e, "x86.sse2.mfence", voidTy);
   case X86::BI_mm_sfence:
+    return emitIntrinsicCallOp(*this, e, "x86.sse.sfence", voidTy);
   case X86::BI__rdtsc:
   case X86::BI__builtin_ia32_rdtscp:
   case X86::BI__builtin_ia32_lzcnt_u16:

clang/test/CIR/CodeGen/X86/sse-builtins.c

@@ -21,3 +21,11 @@ void test_mm_prefetch(char const* p) {
   // CIR: cir.prefetch read locality(0) %{{.*}} : !cir.ptr<!void>
   // LLVM: call void @llvm.prefetch.p0(ptr {{.*}}, i32 0, i32 0, i32 1)
 }
+
+void test_mm_sfence(void) {
+  // CIR-LABEL: test_mm_sfence
+  // LLVM-LABEL: test_mm_sfence
+  _mm_sfence();
+  // CIR: {{%.*}} = cir.call_llvm_intrinsic "x86.sse.sfence" : () -> !void
+  // LLVM: call void @llvm.x86.sse.sfence()
+}

clang/test/CIR/CodeGen/X86/sse2-builtins.c

@@ -21,3 +21,27 @@ void test_mm_clflush(void* A) {
   // CIR-CHECK: {{%.*}} = cir.call_llvm_intrinsic "x86.sse2.clflush" {{%.*}} : (!cir.ptr<!void>) -> !void
   // LLVM-CHECK: call void @llvm.x86.sse2.clflush(ptr {{%.*}})
 }
+
+void test_mm_lfence(void) {
+  // CIR-CHECK-LABEL: test_mm_lfence
+  // LLVM-CHECK-LABEL: test_mm_lfence
+  _mm_lfence();
+  // CIR-CHECK: {{%.*}} = cir.call_llvm_intrinsic "x86.sse2.lfence" : () -> !void
+  // LLVM-CHECK: call void @llvm.x86.sse2.lfence()
+}
+
+void test_mm_mfence(void) {
+  // CIR-CHECK-LABEL: test_mm_mfence
+  // LLVM-CHECK-LABEL: test_mm_mfence
+  _mm_mfence();
+  // CIR-CHECK: {{%.*}} = cir.call_llvm_intrinsic "x86.sse2.mfence" : () -> !void
+  // LLVM-CHECK: call void @llvm.x86.sse2.mfence()
+}
+
+void test_mm_pause(void) {
+  // CIR-LABEL: test_mm_pause
+  // LLVM-LABEL: test_mm_pause
+  _mm_pause();
+  // CIR: {{%.*}} = cir.call_llvm_intrinsic "x86.sse2.pause" : () -> !void
+  // LLVM: call void @llvm.x86.sse2.pause()
+}