Apply suggested changes

Author: Thibault-Monnier

clang/lib/CIR/CodeGen/CIRGenBuiltinX86.cpp

@@ -140,23 +140,19 @@ mlir::Value CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID,
     return {};
   case X86::BI_mm_setcsr:
   case X86::BI__builtin_ia32_ldmxcsr: {
-    Address tmp =
-        createMemTemp(e->getArg(0)->getType(), getLoc(e->getExprLoc()));
-    builder.createStore(getLoc(e->getExprLoc()), ops[0], tmp);
-    return cir::LLVMIntrinsicCallOp::create(
-               builder, getLoc(e->getExprLoc()),
-               builder.getStringAttr("x86.sse.ldmxcsr"), builder.getVoidTy(),
-               tmp.getPointer())
-        .getResult();
+    mlir::Location loc = getLoc(e->getExprLoc());
+    Address tmp = createMemTemp(e->getArg(0)->getType(), loc);
+    builder.createStore(loc, ops[0], tmp);
+    return emitIntrinsicCallOp(*this, e, "x86.sse.ldmxcsr", builder.getVoidTy(),
+                               tmp.getPointer());
   }
   case X86::BI_mm_getcsr:
   case X86::BI__builtin_ia32_stmxcsr: {
-    Address tmp = createMemTemp(e->getType(), getLoc(e->getExprLoc()));
-    cir::LLVMIntrinsicCallOp::create(builder, getLoc(e->getExprLoc()),
-                                     builder.getStringAttr("x86.sse.stmxcsr"),
-                                     builder.getVoidTy(), tmp.getPointer())
-        .getResult();
-    return builder.createLoad(getLoc(e->getExprLoc()), tmp);
+    mlir::Location loc = getLoc(e->getExprLoc());
+    Address tmp = createMemTemp(e->getType(), loc);
+    emitIntrinsicCallOp(*this, e, "x86.sse.stmxcsr", builder.getVoidTy(),
+                        tmp.getPointer());
+    return builder.createLoad(loc, tmp);
   }
   case X86::BI__builtin_ia32_xsave:
   case X86::BI__builtin_ia32_xsave64:

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

@@ -24,6 +24,10 @@ void test_mm_setcsr(unsigned int A) {
   // LLVM-LABEL: test_mm_setcsr
   // LLVM: store i32
   // LLVM: call void @llvm.x86.sse.ldmxcsr(ptr {{.*}})
+
+  // OGCG-LABEL: test_mm_setcsr
+  // OGCG: store i32
+  // OGCG: call void @llvm.x86.sse.ldmxcsr(ptr {{.*}})
   _mm_setcsr(A);
 }
 
@@ -35,6 +39,10 @@ unsigned int test_mm_getcsr(void) {
   // LLVM-LABEL: test_mm_getcsr
   // LLVM: call void @llvm.x86.sse.stmxcsr(ptr %{{.*}})
   // LLVM: load i32
+
+  // OGCG-LABEL: test_mm_getcsr
+  // OGCG: call void @llvm.x86.sse.stmxcsr(ptr %{{.*}})
+  // OGCG: load i32
   return _mm_getcsr();
 }