[Mlir-commits] [mlir] b7fcf51 - [OpenMP][OpenMPIRBuilder] Add kernel launch codegen to emitTargetCall
Jan Sjodin
llvmlistbot at llvm.org
Tue Aug 15 07:08:16 PDT 2023
Author: Jan Sjodin
Date: 2023-08-15T10:03:06-04:00
New Revision: b7fcf515150f7bdf052e08ebd192c8b644d2ec14
URL: https://github.com/llvm/llvm-project/commit/b7fcf515150f7bdf052e08ebd192c8b644d2ec14
DIFF: https://github.com/llvm/llvm-project/commit/b7fcf515150f7bdf052e08ebd192c8b644d2ec14.diff
LOG: [OpenMP][OpenMPIRBuilder] Add kernel launch codegen to emitTargetCall
This patch adds code emission in emitTargetCall to call the OpenMP runtime to
launch an kernel, and to call the fallback host implementation if the launch
fails.
Reviewed By: TIFitis, kiranchandramohan, jdoerfert
Differential Revision: https://reviews.llvm.org/D155633
Added:
Modified:
llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir
mlir/test/Target/LLVMIR/omptarget-region-llvm.mlir
mlir/test/Target/LLVMIR/omptarget-region-parallel-llvm.mlir
Removed:
################################################################################
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
index a477c80c14ec80..34c67afb0597e5 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
@@ -2088,6 +2088,12 @@ class OpenMPIRBuilder {
/// duplicating the body code.
enum BodyGenTy { Priv, DupNoPriv, NoPriv };
+ /// Callback type for creating the map infos for the kernel parameters.
+ /// \param CodeGenIP is the insertion point where code should be generated,
+ /// if any.
+ using GenMapInfoCallbackTy =
+ function_ref<MapInfosTy &(InsertPointTy CodeGenIP)>;
+
/// Generator for '#omp target data'
///
/// \param Loc The location where the target data construct was encountered.
@@ -2108,8 +2114,7 @@ class OpenMPIRBuilder {
OpenMPIRBuilder::InsertPointTy createTargetData(
const LocationDescription &Loc, InsertPointTy AllocaIP,
InsertPointTy CodeGenIP, Value *DeviceID, Value *IfCond,
- TargetDataInfo &Info,
- function_ref<MapInfosTy &(InsertPointTy CodeGenIP)> GenMapInfoCB,
+ TargetDataInfo &Info, GenMapInfoCallbackTy GenMapInfoCB,
omp::RuntimeFunction *MapperFunc = nullptr,
function_ref<InsertPointTy(InsertPointTy CodeGenIP,
BodyGenTy BodyGenType)>
@@ -2133,10 +2138,12 @@ class OpenMPIRBuilder {
/// as arguments to the outlined function.
/// \param BodyGenCB Callback that will generate the region code.
InsertPointTy createTarget(const LocationDescription &Loc,
+ OpenMPIRBuilder::InsertPointTy AllocaIP,
OpenMPIRBuilder::InsertPointTy CodeGenIP,
TargetRegionEntryInfo &EntryInfo, int32_t NumTeams,
int32_t NumThreads,
SmallVectorImpl<Value *> &Inputs,
+ GenMapInfoCallbackTy GenMapInfoCB,
TargetBodyGenCallbackTy BodyGenCB);
/// Declarations for LLVM-IR types (simple, array, function and structure) are
diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
index 3eedef17b0d080..48857757047564 100644
--- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -4200,8 +4200,7 @@ Constant *OpenMPIRBuilder::registerTargetRegionFunction(
OpenMPIRBuilder::InsertPointTy OpenMPIRBuilder::createTargetData(
const LocationDescription &Loc, InsertPointTy AllocaIP,
InsertPointTy CodeGenIP, Value *DeviceID, Value *IfCond,
- TargetDataInfo &Info,
- function_ref<MapInfosTy &(InsertPointTy CodeGenIP)> GenMapInfoCB,
+ TargetDataInfo &Info, GenMapInfoCallbackTy GenMapInfoCB,
omp::RuntimeFunction *MapperFunc,
function_ref<InsertPointTy(InsertPointTy CodeGenIP, BodyGenTy BodyGenType)>
BodyGenCB,
@@ -4419,8 +4418,9 @@ createOutlinedFunction(OpenMPIRBuilder &OMPBuilder, IRBuilderBase &Builder,
static void
emitTargetOutlinedFunction(OpenMPIRBuilder &OMPBuilder, IRBuilderBase &Builder,
TargetRegionEntryInfo &EntryInfo,
- Function *&OutlinedFn, int32_t NumTeams,
- int32_t NumThreads, SmallVectorImpl<Value *> &Inputs,
+ Function *&OutlinedFn, Constant *&OutlinedFnID,
+ int32_t NumTeams, int32_t NumThreads,
+ SmallVectorImpl<Value *> &Inputs,
OpenMPIRBuilder::TargetBodyGenCallbackTy &CBFunc) {
OpenMPIRBuilder::FunctionGenCallback &&GenerateOutlinedFunction =
@@ -4429,32 +4429,81 @@ emitTargetOutlinedFunction(OpenMPIRBuilder &OMPBuilder, IRBuilderBase &Builder,
CBFunc);
};
- Constant *OutlinedFnID;
OMPBuilder.emitTargetRegionFunction(EntryInfo, GenerateOutlinedFunction,
NumTeams, NumThreads, true, OutlinedFn,
OutlinedFnID);
}
-static void emitTargetCall(IRBuilderBase &Builder, Function *OutlinedFn,
- SmallVectorImpl<Value *> &Args) {
- // TODO: Add kernel launch call
- Builder.CreateCall(OutlinedFn, Args);
+static void emitTargetCall(OpenMPIRBuilder &OMPBuilder, IRBuilderBase &Builder,
+ OpenMPIRBuilder::InsertPointTy AllocaIP,
+ Function *OutlinedFn, Constant *OutlinedFnID,
+ int32_t NumTeams, int32_t NumThreads,
+ SmallVectorImpl<Value *> &Args,
+ OpenMPIRBuilder::GenMapInfoCallbackTy GenMapInfoCB) {
+
+ OpenMPIRBuilder::TargetDataInfo Info(
+ /*RequiresDevicePointerInfo=*/false,
+ /*SeparateBeginEndCalls=*/true);
+
+ OpenMPIRBuilder::MapInfosTy &MapInfo = GenMapInfoCB(Builder.saveIP());
+ OMPBuilder.emitOffloadingArrays(AllocaIP, Builder.saveIP(), MapInfo, Info,
+ /*IsNonContiguous=*/true);
+
+ OpenMPIRBuilder::TargetDataRTArgs RTArgs;
+ OMPBuilder.emitOffloadingArraysArgument(Builder, RTArgs, Info,
+ !MapInfo.Names.empty());
+
+ // emitKernelLaunch
+ auto &&EmitTargetCallFallbackCB =
+ [&](OpenMPIRBuilder::InsertPointTy IP) -> OpenMPIRBuilder::InsertPointTy {
+ Builder.restoreIP(IP);
+ Builder.CreateCall(OutlinedFn, Args);
+ return Builder.saveIP();
+ };
+
+ unsigned NumTargetItems = MapInfo.BasePointers.size();
+ // TODO: Use correct device ID
+ Value *DeviceID = Builder.getInt64(OMP_DEVICEID_UNDEF);
+ Value *NumTeamsVal = Builder.getInt32(NumTeams);
+ Value *NumThreadsVal = Builder.getInt32(NumThreads);
+ uint32_t SrcLocStrSize;
+ Constant *SrcLocStr = OMPBuilder.getOrCreateDefaultSrcLocStr(SrcLocStrSize);
+ Value *RTLoc = OMPBuilder.getOrCreateIdent(SrcLocStr, SrcLocStrSize,
+ llvm::omp::IdentFlag(0), 0);
+ // TODO: Use correct NumIterations
+ Value *NumIterations = Builder.getInt64(0);
+ // TODO: Use correct DynCGGroupMem
+ Value *DynCGGroupMem = Builder.getInt32(0);
+
+ bool HasNoWait = false;
+
+ OpenMPIRBuilder::TargetKernelArgs KArgs(NumTargetItems, RTArgs, NumIterations,
+ NumTeamsVal, NumThreadsVal,
+ DynCGGroupMem, HasNoWait);
+
+ Builder.restoreIP(OMPBuilder.emitKernelLaunch(
+ Builder, OutlinedFn, OutlinedFnID, EmitTargetCallFallbackCB, KArgs,
+ DeviceID, RTLoc, AllocaIP));
}
OpenMPIRBuilder::InsertPointTy OpenMPIRBuilder::createTarget(
- const LocationDescription &Loc, OpenMPIRBuilder::InsertPointTy CodeGenIP,
- TargetRegionEntryInfo &EntryInfo, int32_t NumTeams, int32_t NumThreads,
- SmallVectorImpl<Value *> &Args, TargetBodyGenCallbackTy CBFunc) {
+ const LocationDescription &Loc, InsertPointTy AllocaIP,
+ InsertPointTy CodeGenIP, TargetRegionEntryInfo &EntryInfo, int32_t NumTeams,
+ int32_t NumThreads, SmallVectorImpl<Value *> &Args,
+ GenMapInfoCallbackTy GenMapInfoCB, TargetBodyGenCallbackTy CBFunc) {
if (!updateToLocation(Loc))
return InsertPointTy();
Builder.restoreIP(CodeGenIP);
Function *OutlinedFn;
- emitTargetOutlinedFunction(*this, Builder, EntryInfo, OutlinedFn, NumTeams,
- NumThreads, Args, CBFunc);
+ Constant *OutlinedFnID;
+ emitTargetOutlinedFunction(*this, Builder, EntryInfo, OutlinedFn,
+ OutlinedFnID, NumTeams, NumThreads, Args, CBFunc);
if (!Config.isTargetDevice())
- emitTargetCall(Builder, OutlinedFn, Args);
+ emitTargetCall(*this, Builder, AllocaIP, OutlinedFn, OutlinedFnID, NumTeams,
+ NumThreads, Args, GenMapInfoCB);
+
return Builder.saveIP();
}
diff --git a/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp b/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
index 0ec7b751be60e3..5870457956b543 100644
--- a/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
+++ b/llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
@@ -5103,6 +5103,27 @@ TEST_F(OpenMPIRBuilderTest, TargetDataRegion) {
EXPECT_FALSE(verifyModule(*M, &errs()));
}
+namespace {
+// Some basic handling of argument mapping for the moment
+void CreateDefaultMapInfos(llvm::OpenMPIRBuilder &OmpBuilder,
+ llvm::SmallVectorImpl<llvm::Value *> &Args,
+ llvm::OpenMPIRBuilder::MapInfosTy &CombinedInfo) {
+ for (auto Arg : Args) {
+ CombinedInfo.BasePointers.emplace_back(Arg);
+ CombinedInfo.Pointers.emplace_back(Arg);
+ uint32_t SrcLocStrSize;
+ CombinedInfo.Names.emplace_back(OmpBuilder.getOrCreateSrcLocStr(
+ "Unknown loc - stub implementation", SrcLocStrSize));
+ CombinedInfo.Types.emplace_back(llvm::omp::OpenMPOffloadMappingFlags(
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TO |
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_FROM |
+ llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TARGET_PARAM));
+ CombinedInfo.Sizes.emplace_back(OmpBuilder.Builder.getInt64(
+ OmpBuilder.M.getDataLayout().getTypeAllocSize(Arg->getType())));
+ }
+}
+} // namespace
+
TEST_F(OpenMPIRBuilderTest, TargetRegion) {
using InsertPointTy = OpenMPIRBuilder::InsertPointTy;
OpenMPIRBuilder OMPBuilder(*M);
@@ -5134,28 +5155,52 @@ TEST_F(OpenMPIRBuilderTest, TargetRegion) {
Inputs.push_back(BPtr);
Inputs.push_back(CPtr);
+ llvm::OpenMPIRBuilder::MapInfosTy CombinedInfos;
+ auto GenMapInfoCB = [&](llvm::OpenMPIRBuilder::InsertPointTy codeGenIP)
+ -> llvm::OpenMPIRBuilder::MapInfosTy & {
+ CreateDefaultMapInfos(OMPBuilder, Inputs, CombinedInfos);
+ return CombinedInfos;
+ };
+
TargetRegionEntryInfo EntryInfo("func", 42, 4711, 17);
OpenMPIRBuilder::LocationDescription OmpLoc({Builder.saveIP(), DL});
- Builder.restoreIP(OMPBuilder.createTarget(OmpLoc, Builder.saveIP(), EntryInfo,
- -1, -1, Inputs, BodyGenCB));
+ Builder.restoreIP(OMPBuilder.createTarget(OmpLoc, Builder.saveIP(),
+ Builder.saveIP(), EntryInfo, -1, 0,
+ Inputs, GenMapInfoCB, BodyGenCB));
OMPBuilder.finalize();
Builder.CreateRetVoid();
- // Check the outlined call
+ // Check the kernel launch sequence
auto Iter = F->getEntryBlock().rbegin();
- CallInst *Call = dyn_cast<CallInst>(&*(++Iter));
- EXPECT_NE(Call, nullptr);
+ EXPECT_TRUE(isa<BranchInst>(&*(Iter)));
+ BranchInst *Branch = dyn_cast<BranchInst>(&*(Iter));
+ EXPECT_TRUE(isa<CmpInst>(&*(++Iter)));
+ EXPECT_TRUE(isa<CallInst>(&*(++Iter)));
+ CallInst *Call = dyn_cast<CallInst>(&*(Iter));
+
+ // Check that the kernel launch function is called
+ Function *KernelLaunchFunc = Call->getCalledFunction();
+ EXPECT_NE(KernelLaunchFunc, nullptr);
+ StringRef FunctionName = KernelLaunchFunc->getName();
+ EXPECT_TRUE(FunctionName.startswith("__tgt_target_kernel"));
+
+ // Check the fallback call
+ BasicBlock *FallbackBlock = Branch->getSuccessor(0);
+ Iter = FallbackBlock->rbegin();
+ CallInst *FCall = dyn_cast<CallInst>(&*(++Iter));
+ EXPECT_NE(FCall, nullptr);
// Check that the correct aguments are passed in
- for (auto ArgInput : zip(Call->args(), Inputs)) {
+ for (auto ArgInput : zip(FCall->args(), Inputs)) {
EXPECT_EQ(std::get<0>(ArgInput), std::get<1>(ArgInput));
}
// Check that the outlined function exists with the expected prefix
- Function *OutlinedFunc = Call->getCalledFunction();
+ Function *OutlinedFunc = FCall->getCalledFunction();
EXPECT_NE(OutlinedFunc, nullptr);
- StringRef FunctionName = OutlinedFunc->getName();
- EXPECT_TRUE(FunctionName.startswith("__omp_offloading"));
+ StringRef FunctionName2 = OutlinedFunc->getName();
+ EXPECT_TRUE(FunctionName2.startswith("__omp_offloading"));
+
EXPECT_FALSE(verifyModule(*M, &errs()));
}
@@ -5174,6 +5219,13 @@ TEST_F(OpenMPIRBuilderTest, TargetRegionDevice) {
Constant::getNullValue(PointerType::get(Ctx, 0)),
Constant::getNullValue(PointerType::get(Ctx, 0))};
+ llvm::OpenMPIRBuilder::MapInfosTy CombinedInfos;
+ auto GenMapInfoCB = [&](llvm::OpenMPIRBuilder::InsertPointTy codeGenIP)
+ -> llvm::OpenMPIRBuilder::MapInfosTy & {
+ CreateDefaultMapInfos(OMPBuilder, CapturedArgs, CombinedInfos);
+ return CombinedInfos;
+ };
+
auto BodyGenCB = [&](OpenMPIRBuilder::InsertPointTy AllocaIP,
OpenMPIRBuilder::InsertPointTy CodeGenIP)
-> OpenMPIRBuilder::InsertPointTy {
@@ -5188,9 +5240,10 @@ TEST_F(OpenMPIRBuilderTest, TargetRegionDevice) {
TargetRegionEntryInfo EntryInfo("parent", /*DeviceID=*/1, /*FileID=*/2,
/*Line=*/3, /*Count=*/0);
- Builder.restoreIP(
- OMPBuilder.createTarget(Loc, EntryIP, EntryInfo, /*NumTeams=*/-1,
- /*NumThreads=*/-1, CapturedArgs, BodyGenCB));
+ Builder.restoreIP(OMPBuilder.createTarget(
+ Loc, EntryIP, EntryIP, EntryInfo, /*NumTeams=*/-1,
+ /*NumThreads=*/0, CapturedArgs, GenMapInfoCB, BodyGenCB));
+
Builder.CreateRetVoid();
OMPBuilder.finalize();
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index ac410e60e0bb6e..7e955b91e19c5e 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -1382,7 +1382,8 @@ static void genMapInfos(llvm::IRBuilderBase &builder,
const SmallVector<Value> &mapOperands,
const ArrayAttr &mapTypes,
const SmallVector<Value> &devPtrOperands = {},
- const SmallVector<Value> &devAddrOperands = {}) {
+ const SmallVector<Value> &devAddrOperands = {},
+ bool IsTargetParams = false) {
llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
auto fail = [&combinedInfo]() -> void {
@@ -1417,8 +1418,14 @@ static void genMapInfos(llvm::IRBuilderBase &builder,
llvm::OpenMPIRBuilder::DeviceInfoTy::None);
combinedInfo.Names.emplace_back(
LLVM::createMappingInformation(mapOp.getLoc(), *ompBuilder));
- combinedInfo.Types.emplace_back(llvm::omp::OpenMPOffloadMappingFlags(
- mapTypes[index].dyn_cast<IntegerAttr>().getInt()));
+
+ combinedInfo.Types.emplace_back(
+ llvm::omp::OpenMPOffloadMappingFlags(
+ mapTypes[index].dyn_cast<IntegerAttr>().getInt()) |
+ (IsTargetParams
+ ? llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_TARGET_PARAM
+ : llvm::omp::OpenMPOffloadMappingFlags::OMP_MAP_NONE));
+
combinedInfo.Sizes.emplace_back(
builder.getInt64(getSizeInBytes(DL, mapOp.getType())));
index++;
@@ -1740,11 +1747,27 @@ convertOmpTarget(Operation &opInst, llvm::IRBuilderBase &builder,
return failure();
int32_t defaultValTeams = -1;
- int32_t defaultValThreads = -1;
+ int32_t defaultValThreads = 0;
+
+ llvm::OpenMPIRBuilder::InsertPointTy allocaIP =
+ findAllocaInsertPoint(builder, moduleTranslation);
+
+ DataLayout DL = DataLayout(opInst.getParentOfType<ModuleOp>());
+ SmallVector<Value> mapOperands = targetOp.getMapOperands();
+ ArrayAttr mapTypes = targetOp.getMapTypes().value();
+
+ llvm::OpenMPIRBuilder::MapInfosTy combinedInfos;
+ auto genMapInfoCB = [&](llvm::OpenMPIRBuilder::InsertPointTy codeGenIP)
+ -> llvm::OpenMPIRBuilder::MapInfosTy & {
+ builder.restoreIP(codeGenIP);
+ genMapInfos(builder, moduleTranslation, DL, combinedInfos, mapOperands,
+ mapTypes, {}, {}, true);
+ return combinedInfos;
+ };
builder.restoreIP(moduleTranslation.getOpenMPBuilder()->createTarget(
- ompLoc, builder.saveIP(), entryInfo, defaultValTeams, defaultValThreads,
- inputs, bodyCB));
+ ompLoc, allocaIP, builder.saveIP(), entryInfo, defaultValTeams,
+ defaultValThreads, inputs, genMapInfoCB, bodyCB));
return bodyGenStatus;
}
diff --git a/mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir b/mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir
index ce50706a550891..e9444eb01ba7a6 100644
--- a/mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir
+++ b/mlir/test/Target/LLVMIR/omptarget-region-device-llvm.mlir
@@ -12,7 +12,7 @@ module attributes {omp.is_target_device = true} {
%7 = llvm.alloca %6 x i32 {bindc_name = "c", in_type = i32, operandSegmentSizes = array<i32: 0, 0>, uniq_name = "_QFomp_target_regionEc"} : (i64) -> !llvm.ptr<i32>
llvm.store %1, %3 : !llvm.ptr<i32>
llvm.store %0, %5 : !llvm.ptr<i32>
- omp.target {
+ omp.target map((to -> %3 : !llvm.ptr<i32>), (to -> %5 : !llvm.ptr<i32>), (from -> %7 : !llvm.ptr<i32>)) {
%8 = llvm.load %3 : !llvm.ptr<i32>
%9 = llvm.load %5 : !llvm.ptr<i32>
%10 = llvm.add %8, %9 : i32
diff --git a/mlir/test/Target/LLVMIR/omptarget-region-llvm.mlir b/mlir/test/Target/LLVMIR/omptarget-region-llvm.mlir
index 9ba083d5137d88..8b212dae8ef2a7 100644
--- a/mlir/test/Target/LLVMIR/omptarget-region-llvm.mlir
+++ b/mlir/test/Target/LLVMIR/omptarget-region-llvm.mlir
@@ -12,7 +12,7 @@ module attributes {omp.is_target_device = false} {
%7 = llvm.alloca %6 x i32 {bindc_name = "c", in_type = i32, operandSegmentSizes = array<i32: 0, 0>, uniq_name = "_QFomp_target_regionEc"} : (i64) -> !llvm.ptr<i32>
llvm.store %1, %3 : !llvm.ptr<i32>
llvm.store %0, %5 : !llvm.ptr<i32>
- omp.target {
+ omp.target map((to -> %3 : !llvm.ptr<i32>), (to -> %5 : !llvm.ptr<i32>), (from -> %7 : !llvm.ptr<i32>)) {
%8 = llvm.load %3 : !llvm.ptr<i32>
%9 = llvm.load %5 : !llvm.ptr<i32>
%10 = llvm.add %8, %9 : i32
@@ -23,7 +23,13 @@ module attributes {omp.is_target_device = false} {
}
}
-// CHECK: call void @__omp_offloading_[[DEV:.*]]_[[FIL:.*]]_omp_target_region__l[[LINE:.*]](ptr %{{.*}}, ptr %{{.*}}, ptr %{{.*}})
+// CHECK: call i32 @__tgt_target_kernel(ptr @4, i64 -1, i32 -1, i32 0, ptr @.__omp_offloading_[[DEV:.*]]_[[FIL:.*]]_omp_target_region__l[[LINE:.*]].region_id, ptr %kernel_args)
+
+// CHECK: br i1 %{{.*}}, label %omp_offload.failed, label %omp_offload.cont
+// CHECK: omp_offload.failed:
+// CHECK: call void @__omp_offloading_[[DEV]]_[[FIL]]_omp_target_region__l[[LINE]](ptr %{{.*}}, ptr %{{.*}}, ptr %{{.*}})
+// CHECK: omp_offload.cont:
+
// CHECK: define internal void @__omp_offloading_[[DEV]]_[[FIL]]_omp_target_region__l[[LINE]](ptr %[[ADDR_A:.*]], ptr %[[ADDR_B:.*]], ptr %[[ADDR_C:.*]])
// CHECK: %[[VAL_A:.*]] = load i32, ptr %[[ADDR_A]], align 4
// CHECK: %[[VAL_B:.*]] = load i32, ptr %[[ADDR_B]], align 4
diff --git a/mlir/test/Target/LLVMIR/omptarget-region-parallel-llvm.mlir b/mlir/test/Target/LLVMIR/omptarget-region-parallel-llvm.mlir
index 7f5e79db9bcd65..dce2f58487da16 100644
--- a/mlir/test/Target/LLVMIR/omptarget-region-parallel-llvm.mlir
+++ b/mlir/test/Target/LLVMIR/omptarget-region-parallel-llvm.mlir
@@ -12,7 +12,7 @@ module attributes {omp.is_target_device = false} {
%7 = llvm.alloca %6 x i32 {bindc_name = "c", in_type = i32, operandSegmentSizes = array<i32: 0, 0>, uniq_name = "_QFomp_target_regionEc"} : (i64) -> !llvm.ptr<i32>
llvm.store %1, %3 : !llvm.ptr<i32>
llvm.store %0, %5 : !llvm.ptr<i32>
- omp.target {
+ omp.target map((to -> %3 : !llvm.ptr<i32>), (to -> %5 : !llvm.ptr<i32>), (from -> %7 : !llvm.ptr<i32>)) {
omp.parallel {
%8 = llvm.load %3 : !llvm.ptr<i32>
%9 = llvm.load %5 : !llvm.ptr<i32>
More information about the Mlir-commits
mailing list