Format

Author: HendrikHuebner

clang/lib/CIR/CodeGen/CIRGenBuiltinX86.cpp

@@ -41,15 +41,16 @@ static mlir::Value emitIntrinsicCallOp(CIRGenFunction &cgf, const CallExpr *e,
 
 static mlir::Value emitPrefetch(CIRGenFunction &cgf, unsigned builtinID,
                                 const CallExpr *e,
-                                mlir::Value &addr, int64_t hint) {
+                                const SmallVector<mlir::Value> &ops) {
   CIRGenBuilderTy &builder = cgf.getBuilder();
   mlir::Location location = cgf.getLoc(e->getExprLoc());
   mlir::Type voidTy = builder.getVoidTy();
-  mlir::Value address = builder.createPtrBitcast(addr, voidTy);
+  mlir::Value address = builder.createPtrBitcast(ops[0], voidTy);
   bool isWrite{};
   int locality{};
 
   if (builtinID == X86::BI_mm_prefetch) {
+    int hint = getIntValueFromConstOp(ops[1]);
     isWrite = (hint >> 2) & 0x1;
     locality = hint & 0x3;
   } else {
@@ -116,7 +117,7 @@ mlir::Value CIRGenFunction::emitX86BuiltinExpr(unsigned builtinID,
   case X86::BI_mm_prefetch:
   case X86::BI_m_prefetch:
   case X86::BI_m_prefetchw:
-      return emitPrefetch(*this, builtinID, e, ops[0], getIntValueFromConstOp(ops[1]));
+    return emitPrefetch(*this, builtinID, e, ops);
   case X86::BI__rdtsc:
   case X86::BI__builtin_ia32_rdtscp:
   case X86::BI__builtin_ia32_lzcnt_u16:

clang/test/CIR/CodeGen/X86/prefetchw-builtin.c

@@ -15,16 +15,6 @@
 
 #include <x86intrin.h>
 
-void test_m_prefetch(void *p) {
-  // CIR-LABEL: test_m_prefetch
-  // LLVM-LABEL: test_m_prefetch
-  // OGCG-LABEL: test_m_prefetch
-  return _m_prefetch(p);
-  // CIR: cir.prefetch read locality(0) %{{.*}} : !cir.ptr<!void>
-  // LLVM: call void @llvm.prefetch.p0(ptr {{.*}}, i32 0, i32 0, i32 1)
-  // OGCG: call void @llvm.prefetch.p0(ptr {{.*}}, i32 0, i32 0, i32 1)
-}
-
 void test_m_prefetch_w(void *p) {
   // CIR-LABEL: test_m_prefetch_w
   // LLVM-LABEL: test_m_prefetch_w
@@ -34,3 +24,13 @@ void test_m_prefetch_w(void *p) {
   // LLVM: call void @llvm.prefetch.p0(ptr {{.*}}, i32 0, i32 0, i32 1)
   // OGCG: call void @llvm.prefetch.p0(ptr {{.*}}, i32 0, i32 0, i32 1)
 }
+
+void test_m_prefetch(void *p) {
+  // CIR-LABEL: test_m_prefetch
+  // LLVM-LABEL: test_m_prefetch
+  // OGCG-LABEL: test_m_prefetch
+  return _m_prefetch(p);
+  // CIR: cir.prefetch read locality(0) %{{.*}} : !cir.ptr<!void>
+  // LLVM: call void @llvm.prefetch.p0(ptr {{.*}}, i32 0, i32 0, i32 1)
+  // OGCG: call void @llvm.prefetch.p0(ptr {{.*}}, i32 0, i32 0, i32 1)
+}