Skip to content

Prevent name clash of global variables for static variable initialization #234

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Prevent name clash of global variables for static variable initialization #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f97add5
Prevent name clash of global variable for static variable initialization
ivanradanov Jul 5, 2022
601f573
Fix test
ivanradanov Jul 5, 2022
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
5 changes: 3 additions & 2 deletions tools/cgeist/Lib/clang-mlir.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,8 +844,9 @@ ValueCategory MLIRScanner::VisitVarDecl(clang::VarDecl *decl) {
auto name = Glob.CGM.getMangledName(decl);
auto globalOp = gbuilder.create<mlir::memref::GlobalOp>(
module->getLoc(),
builder.getStringAttr(function.getName() + "@static@" + name +
"@init"),
builder.getStringAttr(
function.getName() + "@static@" + name + "@init@" +
to_string(reinterpret_cast<long long unsigned int>(decl))),
/*sym_visibility*/ mlir::StringAttr(), mlir::TypeAttr::get(mr),
init_value, mlir::UnitAttr(), /*alignment*/ nullptr);
SymbolTable::setSymbolVisibility(globalOp,
Expand Down
4 changes: 2 additions & 2 deletions tools/cgeist/Test/Verification/staticint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ int adder(int x) {
return cur;
}

// CHECK: memref.global "private" @"adder@static@cur@init" : memref<1xi1> = dense<true>
// CHECK: memref.global "private" @"adder@static@cur@init@{{.*}}" : memref<1xi1> = dense<true>
// CHECK: memref.global "private" @"adder@static@cur" : memref<1xi32> = uninitialized
// CHECK: func @adder(%arg0: i32) -> i32 attributes {llvm.linkage = #llvm.linkage<external>} {
// CHECK-DAG: %false = arith.constant false
// CHECK-DAG: %c0_i32 = arith.constant 0 : i32
// CHECK-DAG: %0 = memref.get_global @"adder@static@cur" : memref<1xi32>
// CHECK-DAG: %1 = memref.get_global @"adder@static@cur@init" : memref<1xi1>
// CHECK-DAG: %1 = memref.get_global @"adder@static@cur@init@{{.*}}" : memref<1xi1>
// CHECK-NEXT: %2 = affine.load %1[0] : memref<1xi1>
// CHECK-NEXT: scf.if %2 {
// CHECK-NEXT: affine.store %false, %1[0] : memref<1xi1>
Expand Down