New runtime interface for reducer lookup

Author: VoxSciurorum

clang/lib/CodeGen/CGBuiltin.cpp

@@ -5434,13 +5434,15 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
     return RValue::get(Builder.CreateCall(FF, {}));
   }
   case Builtin::BI__hyper_lookup: {
+    Function *TF = CGM.getIntrinsic(Intrinsic::tapir_frame);
+    llvm::Value *Frame = Builder.CreateCall(TF, {});
     llvm::Value *Size = EmitScalarExpr(E->getArg(1));
     Function *F = CGM.getIntrinsic(Intrinsic::hyper_lookup, Size->getType());
     llvm::Value *Ptr = EmitScalarExpr(E->getArg(0));
     llvm::Value *Identity = EmitScalarExpr(E->getArg(2));
     llvm::Value *Reduce = EmitScalarExpr(E->getArg(3));
     return RValue::get(Builder.CreateCall(
-        F, {Ptr, Size, Builder.CreateBitCast(Identity, VoidPtrTy),
+        F, {Frame, Ptr, Size, Builder.CreateBitCast(Identity, VoidPtrTy),
             Builder.CreateBitCast(Reduce, VoidPtrTy)}));
   }
   }

llvm/include/llvm/IR/Intrinsics.td

@@ -1440,7 +1440,8 @@ def int_tapir_frame
 // but that does not work, so rely on the front end to insert bitcasts.
 def int_hyper_lookup
     : Intrinsic<[llvm_ptr_ty],
-                [llvm_ptr_ty, llvm_anyint_ty, llvm_ptr_ty, llvm_ptr_ty], [
+                [llvm_ptr_ty, llvm_ptr_ty, llvm_anyint_ty,
+                llvm_ptr_ty, llvm_ptr_ty], [
                   IntrWillReturn, IntrReadMem, IntrInaccessibleMemOnly,
                   IntrStrandPure, IntrHyperView, IntrInjective
                 ]>;

llvm/lib/Transforms/Tapir/OpenCilkABI.cpp

@@ -226,8 +226,8 @@ void OpenCilkABI::prepareModule() {
   FunctionType *Grainsize16FnTy = FunctionType::get(Int16Ty, {Int16Ty}, false);
   FunctionType *Grainsize32FnTy = FunctionType::get(Int32Ty, {Int32Ty}, false);
   FunctionType *Grainsize64FnTy = FunctionType::get(Int64Ty, {Int64Ty}, false);
-  FunctionType *LookupTy = FunctionType::get(
-      VoidPtrTy, {VoidPtrTy, Int64Ty, VoidPtrTy, VoidPtrTy}, false);
+  FunctionType *LookupTy = FunctionType::get(VoidPtrTy,
+      {StackFramePtrTy, VoidPtrTy, Int64Ty, VoidPtrTy, VoidPtrTy}, false);
   FunctionType *UnregTy = FunctionType::get(VoidTy, {VoidPtrTy}, false);
   FunctionType *Reg32Ty =
       FunctionType::get(VoidTy, {VoidPtrTy, Int32Ty, VoidPtrTy,
@@ -262,7 +262,7 @@ void OpenCilkABI::prepareModule() {
        CilkRTSCilkForGrainsize32},
       {"__cilkrts_cilk_for_grainsize_64", Grainsize64FnTy,
        CilkRTSCilkForGrainsize64},
-      {"__cilkrts_reducer_lookup", LookupTy, CilkRTSReducerLookup},
+      {"__cilkrts_reducer_lookup_in_frame", LookupTy, CilkRTSReducerLookup},
       {"__cilkrts_reducer_register_32", Reg32Ty, CilkRTSReducerRegister32},
       {"__cilkrts_reducer_register_64", Reg64Ty, CilkRTSReducerRegister64},
       {"__cilkrts_reducer_unregister", UnregTy, CilkRTSReducerUnregister},