Skip to content
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

[Mem2arr] fix dangling users/[Dummy] add static #46

Merged
merged 1 commit into from
Oct 29, 2021
Merged

[Mem2arr] fix dangling users/[Dummy] add static #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion lib/llvm/Transforms/VhlsLLVMRewriter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,7 +1158,8 @@ static void convertMemRefToArray(Module &M, bool ranked = false) {
// Erase the original caller.
Caller->eraseFromParent();
for (Instruction *inst : toErase)
inst->eraseFromParent();
if (inst->getNumUses() == 0)
inst->eraseFromParent();
}

FuncToNew[F] = replaceFunction(F, NewFunc);
Expand Down Expand Up @@ -1589,6 +1590,9 @@ static void generateXlnTBDummy(Function &F, StringRef fileName) {

// Main definition -
XlnTBDummy << "int main() {\n";
// Prepend the `static' keyword to mitigate segmentfault.
for (auto &argDecl : argDeclList)
argDecl = std::string("static ") + argDecl;
// Value declaration
interleave(argDeclList, XlnTBDummy, ";\n");
if (!argDeclList.empty())
Expand Down
0 ...vm/Transforms/VhlsLLVMRewriter/array1d.ll → ...forms/VhlsLLVMRewriter/mem2arr/array1d.ll
View file
Open in desktop
File renamed without changes.
0 ...rms/VhlsLLVMRewriter/array1d_multiargs.ll → ...LLVMRewriter/mem2arr/array1d_multiargs.ll
View file
Open in desktop
File renamed without changes.
0 ...vm/Transforms/VhlsLLVMRewriter/array2d.ll → ...forms/VhlsLLVMRewriter/mem2arr/array2d.ll
View file
Open in desktop
File renamed without changes.
0 ...nsforms/VhlsLLVMRewriter/arraynd_mixed.ll → ...VhlsLLVMRewriter/mem2arr/arraynd_mixed.ll
View file
Open in desktop
File renamed without changes.
0 ...lvm/Transforms/VhlsLLVMRewriter/malloc.ll → ...sforms/VhlsLLVMRewriter/mem2arr/malloc.ll
View file
Open in desktop
File renamed without changes.
0 ...m/Transforms/VhlsLLVMRewriter/matmul.mlir → ...orms/VhlsLLVMRewriter/mem2arr/matmul.mlir
View file
Open in desktop
File renamed without changes.
29 changes: 29 additions & 0 deletions test/llvm/Transforms/VhlsLLVMRewriter/mem2arr/multicalls.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// RUN: mlir-opt -lower-affine -convert-scf-to-std -convert-memref-to-llvm -convert-arith-to-llvm -convert-std-to-llvm='use-bare-ptr-memref-call-conv=1' -reconcile-unrealized-casts %s | mlir-translate -mlir-to-llvmir | opt -enable-new-pm=0 -load ${PHISM_LIBS_DIR}/VhlsLLVMRewriter.so -strip-debug -mem2arr -S | FileCheck %s

func @foo(%A: memref<10xf32>) {
%c0 = arith.constant 0: index
%0 = memref.load %A[%c0] : memref<10xf32>
return
}
func @bar(%A: memref<10xf32>) {
%c0 = arith.constant 0: index
%0 = memref.load %A[%c0] : memref<10xf32>
return
}
func @main() {
%A = memref.alloc() : memref<10xf32>
call @foo(%A): (memref<10xf32>) -> ()
call @bar(%A): (memref<10xf32>) -> ()
return
}

// CHECK: define void @bar([10 x float]* %{{.*}})

// CHECK: define void @foo([10 x float]* %{{.*}})

// CHECK: define void @main()
// CHECK-NEXT: %[[v1:.*]] = call i8* @malloc(i64 ptrtoint (float* getelementptr (float, float* null, i64 10) to i64))
// CHECK-NEXT: %[[v2:.*]] = bitcast i8* %[[v1]] to [10 x float]*
// CHECK-NEXT: %[[v3:.*]] = bitcast i8* %[[v1]] to [10 x float]*
// CHECK-NEXT: call void @foo([10 x float]* %[[v2]])
// CHECK-NEXT: call void @bar([10 x float]* %[[v3]])
6 changes: 3 additions & 3 deletions test/llvm/Transforms/VhlsLLVMRewriter/xlntbgen/test_dummy_c_multi_arrays.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define void @foo(i32 %n, [32 x float]* %A, [4 x [8 x i32]]* %B) {
; CHECK: B[n + 1][n + 1] += B[n][n];
; CHECK: }
; CHECK: int main() {
; CHECK: int n;
; CHECK: float A[32];
; CHECK: int B[4][8];
; CHECK: static int n;
; CHECK: static float A[32];
; CHECK: static int B[4][8];
; CHECK: foo(n, A, B);
; CHECK: return 0;
; CHECK: }
2 changes: 1 addition & 1 deletion test/llvm/Transforms/VhlsLLVMRewriter/xlntbgen/test_dummy_c_no_array.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define void @foo(i32 %n) {
; CHECK: void foo(int n) {
; CHECK: }
; CHECK: int main() {
; CHECK: int n;
; CHECK: static int n;
; CHECK: foo(n);
; CHECK: return 0;
; CHECK: }
4 changes: 2 additions & 2 deletions test/llvm/Transforms/VhlsLLVMRewriter/xlntbgen/test_dummy_c_single_array.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ define void @foo(i32 %n, [32 x float]* %A) {
; CHECK: A[n + 1] += A[n];
; CHECK: }
; CHECK: int main() {
; CHECK: int n;
; CHECK: float A[32];
; CHECK: static int n;
; CHECK: static float A[32];
; CHECK: foo(n, A);
; CHECK: return 0;
; CHECK: }
2 changes: 1 addition & 1 deletion test/llvm/Transforms/VhlsLLVMRewriter/xlntbgen/test_dummy_c_single_array_nd.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ define void @foo(i32 %n, [32 x [24 x float]]* %A) {
; CHECK: A[n + 1][n + 1] += A[n][n];
; CHECK: }
; CHECK: int main() {
; CHECK: int n;
; CHECK: static int n;
; CHECK: float A[32][24];
; CHECK: foo(n, A);
; CHECK: return 0;
Expand Down
2 changes: 1 addition & 1 deletion test/llvm/Transforms/VhlsLLVMRewriter/xlntbgen/test_dummy_c_single_array_no_int.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define void @foo([32 x float]* %A) {
; CHECK: void foo(float A[32]) {
; CHECK: }
; CHECK: int main() {
; CHECK: float A[32];
; CHECK: static float A[32];
; CHECK: foo(A);
; CHECK: return 0;
; CHECK: }