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

[CIR][Codegen] Fixes global variables that point to another globals #1277

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

[CIR][Codegen] Fixes global variables that point to another globals #1277

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d7d7b73
kind of works, but dirty and tests fail
gitoleg Dec 25, 2024
b4a3f15
wip
gitoleg Dec 25, 2024
0252585
[CIR][CodeGen] handle zero init padding case
gitoleg Dec 25, 2024
73436cd
use zero index
gitoleg Dec 25, 2024
f2fc318
refactoring
gitoleg Dec 25, 2024
089364d
handle const arrays
gitoleg Dec 25, 2024
517a89d
wip
gitoleg Dec 26, 2024
9cb7e34
wip, refacroting
gitoleg Dec 26, 2024
f5070b7
wip
gitoleg Dec 28, 2024
30c536f
fixed tests, removed zero index for vtt
gitoleg Jan 9, 2025
1704b37
adds LLVM checks in tests
gitoleg Jan 9, 2025
9b9ae91
[CIR][CodeGen] handle zero init padding case (#1257)
gitoleg Jan 9, 2025
422a663
refactoring wip
gitoleg Jan 10, 2025
0484510
bug fixed
gitoleg Jan 10, 2025
5ac7673
clang-format ...
gitoleg Jan 10, 2025
6349b85
changes after review
gitoleg Jan 13, 2025
d45b5f8
clang-format ...
gitoleg Jan 13, 2025
6150116
minor
gitoleg Jan 13, 2025
9d4e0d7
minor
gitoleg Jan 15, 2025
54ed360
minor
gitoleg Jan 15, 2025
111c9ac
rm leading zero const idx
gitoleg Jan 16, 2025
b538bea
bug fixing
gitoleg Jan 24, 2025
661e4a4
renaming
gitoleg Jan 24, 2025
7c09a9b
fixes multi dim array
gitoleg Jan 27, 2025
44ac729
create new view only for the proper globs
gitoleg Jan 27, 2025
85b8ee5
fixed bug with nested strucutres
gitoleg Jan 28, 2025
c7954a8
fixes tests
gitoleg Jan 29, 2025
a1595a8
clang-format ...
gitoleg Jan 29, 2025
28e1772
wip
gitoleg Jan 29, 2025
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
Prev Previous commit
Next Next commit
minor
  • Loading branch information
@gitoleg
gitoleg committed Jan 29, 2025
commit 9d4e0d7f96b378feaa9bf69465fe3c66983e0ed2
9 changes: 5 additions & 4 deletions clang/include/clang/CIR/Dialect/IR/CIRAttrs.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,11 +622,12 @@ def GlobalViewAttr : CIR_Attr<"GlobalView", "global_view", [TypedAttrInterface]>
cir.global external @elt_ptr = #cir.global_view<@rgb, [1]> : !cir.ptr<i8>
cir.global external @table_of_ptrs = #cir.const_array<[#cir.global_view<@rgb, [1]> : !cir.ptr<i8>] : !cir.array<!cir.ptr<i8> x 1>>
```

Note, that CIR computes indices for vtt slightly different from the LLVM and
doesn't add the leading index since it's always equal to zero. The index is added
later in the lowering.

Note, that unlike LLVM IR's gep instruction, CIR doesn't add the leading zero index
when it's known to be constant zero, e.g. for pointers, i.e. we use indexes exactly
to access sub elements or for the offset. The leading zero index is added later in
the lowering.

Example:
```
struct A {
Expand Down
20 changes: 4 additions & 16 deletions clang/test/CIR/CodeGen/replace-globals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// RUN: FileCheck --input-file=%t.cir %s
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-llvm %s -o %t.ll
// RUN: FileCheck --input-file=%t.ll %s -check-prefix=LLVM
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -emit-llvm %s -o %t.ll
// RUN: FileCheck --input-file=%t.ll %s -check-prefix=OG

typedef struct {
int f0 : 24;
Expand Down Expand Up @@ -47,17 +45,7 @@ void use() {
// LLVM-DAG: @g7 = internal global [2 x ptr] [ptr getelementptr inbounds ([2 x { i8, i8, i8, i8, i32, i32 }], ptr @g6, i32 0, i32 0, i32 5), ptr getelementptr inbounds ([2 x { i8, i8, i8, i8, i32, i32 }], ptr @g6, i32 0, i32 1, i32 5)], align 16
// LLVM-DAG: @g8 = internal global ptr getelementptr inbounds ([2 x ptr], ptr @g7, i32 0, i32 1), align 8

bcardosolopes marked this conversation as resolved.
Show resolved Hide resolved
// OG-DAG: @g1 = internal global { i8, i8, i8, i8, i32, i32 } { i8 -17, i8 10, i8 0, i8 0, i32 9, i32 123 }, align 4
// OG-DAG: @g2 = internal global [4 x ptr] [ptr getelementptr (i8, ptr @g1, i64 4), ptr getelementptr (i8, ptr @g1, i64 4), ptr getelementptr (i8, ptr @g1, i64 4), ptr getelementptr (i8, ptr @g1, i64 4)], align 16
// OG-DAG: @g3 = internal global ptr getelementptr (i8, ptr @g2, i64 8), align 8
// OG-DAG: @g4 = internal global ptr @g3, align 8
// OG-DAG: @g5 = internal global ptr @g4, align 8
// OG-DAG: @g6 = internal global [2 x { i8, i8, i8, i8, i32, i32 }] [{ i8, i8, i8, i8, i32, i32 } { i8 -17, i8 10, i8 0, i8 0, i32 9, i32 123 }, { i8, i8, i8, i8, i32, i32 } { i8 -17, i8 10, i8 0, i8 0, i32 9, i32 123 }], align 16
// OG-DAG: @g7 = internal global [2 x ptr] [ptr getelementptr (i8, ptr @g6, i64 8), ptr getelementptr (i8, ptr @g6, i64 20)], align 16
// OG-DAG: @g8 = internal global ptr getelementptr (i8, ptr @g7, i64 8), align 8






// FIXME: LLVM output should be: @g2 = internal global [4 x ptr] [ptr getelementptr (i8, ptr @g1, i64 4), ptr getelementptr (i8, ptr @g1, i64 4), ptr getelementptr (i8, ptr @g1, i64 4), ptr getelementptr (i8, ptr @g1, i64 4)], align 16
// FIXME: LLVM output should be: @g3 = internal global ptr getelementptr (i8, ptr @g2, i64 8), align 8
// FIXME: LLVM output should be: @g7 = internal global [2 x ptr] [ptr getelementptr (i8, ptr @g6, i64 8), ptr getelementptr (i8, ptr @g6, i64 20)], align 16
// FIXME: LLVM output should be: @g8 = internal global ptr getelementptr (i8, ptr @g7, i64 8), align 8