Skip to content

[mlir][LLVM] erase call mappings in forgetMapping() #84955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 20, 2024
Merged

[mlir][LLVM] erase call mappings in forgetMapping() #84955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8ff727
[mlir][LLVM] erase call mappings in forgetMapping()
tblah Feb 21, 2024
9b64ec7
Add test
tblah Mar 15, 2024
a726997
Simplify test
tblah Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,8 @@ void ModuleTranslation::forgetMapping(Region &region) {
branchMapping.erase(&op);
if (isa<LLVM::GlobalOp>(op))
globalsMapping.erase(&op);
if (isa<LLVM::CallOp>(op))
callMapping.erase(&op);
llvm::append_range(
toProcess,
llvm::map_range(op.getRegions(), [](Region &r) { return &r; }));
Expand Down
37 changes: 37 additions & 0 deletions mlir/test/Target/LLVMIR/openmp-reduction-call.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// RUN: mlir-translate -mlir-to-llvmir %s | FileCheck %s

// Test that we don't crash when there is a call operation in the combiner

omp.reduction.declare @add_f32 : f32
init {
^bb0(%arg: f32):
%0 = llvm.mlir.constant(0.0 : f32) : f32
omp.yield (%0 : f32)
}
combiner {
^bb1(%arg0: f32, %arg1: f32):
// test this call here:
llvm.call @test_call() : () -> ()
%1 = llvm.fadd %arg0, %arg1 : f32
omp.yield (%1 : f32)
}

llvm.func @simple_reduction(%lb : i64, %ub : i64, %step : i64) {
%c1 = llvm.mlir.constant(1 : i32) : i32
%0 = llvm.alloca %c1 x i32 : (i32) -> !llvm.ptr
omp.parallel reduction(@add_f32 %0 -> %prv : !llvm.ptr) {
%1 = llvm.mlir.constant(2.0 : f32) : f32
%2 = llvm.load %prv : !llvm.ptr -> f32
%3 = llvm.fadd %1, %2 : f32
llvm.store %3, %prv : f32, !llvm.ptr
omp.terminator
}
llvm.return
}

llvm.func @test_call() -> ()

// Call to the troublesome function will have been inlined twice: once into
// main and once into the outlined function
// CHECK: call void @test_call()
// CHECK: call void @test_call()