carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Unify instruction naming between SemIR and LLVM IR (#3898)

Browse Source 
Factor out `SemIR::InstNamer` and also use it when lowering to LLVM IR.
Automatically name all instructions created with our `IRBuilder` based
on the name computed by the `InstNamer`, and likewise name basic blocks
using the label generated by the `InstNamer`.

Move some of the existing naming logic out from lower into `InstNamer`
so that it's also used in SemIR. In particular, we now name call
instructions after their callee, or after the builtin name for calls to
builtins.

Computing and adding these names isn't completely free. This instruction
naming is designed to be optional, so that we can turn it off for builds
where the LLVM IR will only be converted to assembly and won't be seen
by a human, but so far it's enabled unconditionally. We can tune that
later as needed.
This commit is contained in:
Richard Smith
2024-04-19 02:19:30 +00:00
committed by GitHub
parent 5964795f34
commit 3776c068de
225 changed files with 2835 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/lower/testdata/array/array_in_place.carbon
Vendored
+6 -5
View File
@@ -16,10 +16,11 @@ fn G() {
// CHECK:STDOUT: declare void @F(ptr sret({ i32, i32, i32 }))
// CHECK:STDOUT:
// CHECK:STDOUT: define void @G() {
// CHECK:STDOUT: %v = alloca [2 x { i32, i32, i32 }], align 8
// CHECK:STDOUT: %array.index = getelementptr inbounds [2 x { i32, i32, i32 }], ptr %v, i32 0, i32 0
// CHECK:STDOUT: call void @F(ptr %array.index)
// CHECK:STDOUT: %array.index1 = getelementptr inbounds [2 x { i32, i32, i32 }], ptr %v, i32 0, i32 1
// CHECK:STDOUT: call void @F(ptr %array.index1)
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %v.var = alloca [2 x { i32, i32, i32 }], align 8
// CHECK:STDOUT: %.loc10_42.2.array.index = getelementptr inbounds [2 x { i32, i32, i32 }], ptr %v.var, i32 0, i32 0
// CHECK:STDOUT: call void @F(ptr %.loc10_42.2.array.index)
// CHECK:STDOUT: %.loc10_42.5.array.index = getelementptr inbounds [2 x { i32, i32, i32 }], ptr %v.var, i32 0, i32 1
// CHECK:STDOUT: call void @F(ptr %.loc10_42.5.array.index)
// CHECK:STDOUT: ret void
// CHECK:STDOUT: }
toolchain/lower/testdata/array/assign_return_value.carbon
Vendored
+17 -15
View File
@@ -14,24 +14,26 @@ fn Run() {
// CHECK:STDOUT: source_filename = "assign_return_value.carbon"
// CHECK:STDOUT:
// CHECK:STDOUT: define void @F(ptr sret({ i32, i32 }) %return) {
// CHECK:STDOUT: %tuple.elem = getelementptr inbounds { i32, i32 }, ptr %return, i32 0, i32 0
// CHECK:STDOUT: store i32 12, ptr %tuple.elem, align 4
// CHECK:STDOUT: %tuple.elem1 = getelementptr inbounds { i32, i32 }, ptr %return, i32 0, i32 1
// CHECK:STDOUT: store i32 24, ptr %tuple.elem1, align 4
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %.loc7_38.2.tuple.elem = getelementptr inbounds { i32, i32 }, ptr %return, i32 0, i32 0
// CHECK:STDOUT: store i32 12, ptr %.loc7_38.2.tuple.elem, align 4
// CHECK:STDOUT: %.loc7_38.4.tuple.elem = getelementptr inbounds { i32, i32 }, ptr %return, i32 0, i32 1
// CHECK:STDOUT: store i32 24, ptr %.loc7_38.4.tuple.elem, align 4
// CHECK:STDOUT: ret void
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: define void @main() {
// CHECK:STDOUT: %t = alloca [2 x i32], align 4
// CHECK:STDOUT: %temp = alloca { i32, i32 }, align 8
// CHECK:STDOUT: call void @F(ptr %temp)
// CHECK:STDOUT: %tuple.elem = getelementptr inbounds { i32, i32 }, ptr %temp, i32 0, i32 0
// CHECK:STDOUT: %1 = load i32, ptr %tuple.elem, align 4
// CHECK:STDOUT: %array.index = getelementptr inbounds [2 x i32], ptr %t, i32 0, i32 0
// CHECK:STDOUT: store i32 %1, ptr %array.index, align 4
// CHECK:STDOUT: %tuple.elem1 = getelementptr inbounds { i32, i32 }, ptr %temp, i32 0, i32 1
// CHECK:STDOUT: %2 = load i32, ptr %tuple.elem1, align 4
// CHECK:STDOUT: %array.index2 = getelementptr inbounds [2 x i32], ptr %t, i32 0, i32 1
// CHECK:STDOUT: store i32 %2, ptr %array.index2, align 4
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %t.var = alloca [2 x i32], align 4
// CHECK:STDOUT: %.loc10_22.1.temp = alloca { i32, i32 }, align 8
// CHECK:STDOUT: call void @F(ptr %.loc10_22.1.temp)
// CHECK:STDOUT: %.loc10_22.3.tuple.elem = getelementptr inbounds { i32, i32 }, ptr %.loc10_22.1.temp, i32 0, i32 0
// CHECK:STDOUT: %.loc10_22.4 = load i32, ptr %.loc10_22.3.tuple.elem, align 4
// CHECK:STDOUT: %.loc10_22.6.array.index = getelementptr inbounds [2 x i32], ptr %t.var, i32 0, i32 0
// CHECK:STDOUT: store i32 %.loc10_22.4, ptr %.loc10_22.6.array.index, align 4
// CHECK:STDOUT: %.loc10_22.8.tuple.elem = getelementptr inbounds { i32, i32 }, ptr %.loc10_22.1.temp, i32 0, i32 1
// CHECK:STDOUT: %.loc10_22.9 = load i32, ptr %.loc10_22.8.tuple.elem, align 4
// CHECK:STDOUT: %.loc10_22.11.array.index = getelementptr inbounds [2 x i32], ptr %t.var, i32 0, i32 1
// CHECK:STDOUT: store i32 %.loc10_22.9, ptr %.loc10_22.11.array.index, align 4
// CHECK:STDOUT: ret void
// CHECK:STDOUT: }
toolchain/lower/testdata/array/base.carbon
Vendored
+35 -34
View File
@@ -16,39 +16,40 @@ fn Run() {
// CHECK:STDOUT: source_filename = "base.carbon"
// CHECK:STDOUT:
// CHECK:STDOUT: define void @main() {
// CHECK:STDOUT: %a = alloca [1 x i32], align 4
// CHECK:STDOUT: %array.index = getelementptr inbounds [1 x i32], ptr %a, i32 0, i32 0
// CHECK:STDOUT: store i32 1, ptr %array.index, align 4
// CHECK:STDOUT: %b = alloca [2 x double], align 8
// CHECK:STDOUT: %array.index1 = getelementptr inbounds [2 x double], ptr %b, i32 0, i32 0
// CHECK:STDOUT: store double 0x4026333333333334, ptr %array.index1, align 8
// CHECK:STDOUT: %array.index2 = getelementptr inbounds [2 x double], ptr %b, i32 0, i32 1
// CHECK:STDOUT: store double 2.200000e+00, ptr %array.index2, align 8
// CHECK:STDOUT: %c = alloca [5 x {}], align 8
// CHECK:STDOUT: %array.index3 = getelementptr inbounds [5 x {}], ptr %c, i32 0, i32 0
// CHECK:STDOUT: %array.index4 = getelementptr inbounds [5 x {}], ptr %c, i32 0, i32 1
// CHECK:STDOUT: %array.index5 = getelementptr inbounds [5 x {}], ptr %c, i32 0, i32 2
// CHECK:STDOUT: %array.index6 = getelementptr inbounds [5 x {}], ptr %c, i32 0, i32 3
// CHECK:STDOUT: %array.index7 = getelementptr inbounds [5 x {}], ptr %c, i32 0, i32 4
// CHECK:STDOUT: %d = alloca { i32, i32, i32 }, align 8
// CHECK:STDOUT: %tuple.elem = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 0
// CHECK:STDOUT: store i32 1, ptr %tuple.elem, align 4
// CHECK:STDOUT: %tuple.elem8 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 1
// CHECK:STDOUT: store i32 2, ptr %tuple.elem8, align 4
// CHECK:STDOUT: %tuple.elem9 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 2
// CHECK:STDOUT: store i32 3, ptr %tuple.elem9, align 4
// CHECK:STDOUT: %e = alloca [3 x i32], align 4
// CHECK:STDOUT: %tuple.elem10 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 0
// CHECK:STDOUT: %1 = load i32, ptr %tuple.elem10, align 4
// CHECK:STDOUT: %array.index11 = getelementptr inbounds [3 x i32], ptr %e, i32 0, i32 0
// CHECK:STDOUT: store i32 %1, ptr %array.index11, align 4
// CHECK:STDOUT: %tuple.elem12 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 1
// CHECK:STDOUT: %2 = load i32, ptr %tuple.elem12, align 4
// CHECK:STDOUT: %array.index13 = getelementptr inbounds [3 x i32], ptr %e, i32 0, i32 1
// CHECK:STDOUT: store i32 %2, ptr %array.index13, align 4
// CHECK:STDOUT: %tuple.elem14 = getelementptr inbounds { i32, i32, i32 }, ptr %d, i32 0, i32 2
// CHECK:STDOUT: %3 = load i32, ptr %tuple.elem14, align 4
// CHECK:STDOUT: %array.index15 = getelementptr inbounds [3 x i32], ptr %e, i32 0, i32 2
// CHECK:STDOUT: store i32 %3, ptr %array.index15, align 4
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %a.var = alloca [1 x i32], align 4
// CHECK:STDOUT: %.loc8_24.3.array.index = getelementptr inbounds [1 x i32], ptr %a.var, i32 0, i32 0
// CHECK:STDOUT: store i32 1, ptr %.loc8_24.3.array.index, align 4
// CHECK:STDOUT: %b.var = alloca [2 x double], align 8
// CHECK:STDOUT: %.loc9_32.3.array.index = getelementptr inbounds [2 x double], ptr %b.var, i32 0, i32 0
// CHECK:STDOUT: store double 0x4026333333333334, ptr %.loc9_32.3.array.index, align 8
// CHECK:STDOUT: %.loc9_32.6.array.index = getelementptr inbounds [2 x double], ptr %b.var, i32 0, i32 1
// CHECK:STDOUT: store double 2.200000e+00, ptr %.loc9_32.6.array.index, align 8
// CHECK:STDOUT: %c.var = alloca [5 x {}], align 8
// CHECK:STDOUT: %.loc10_40.3.array.index = getelementptr inbounds [5 x {}], ptr %c.var, i32 0, i32 0
// CHECK:STDOUT: %.loc10_40.6.array.index = getelementptr inbounds [5 x {}], ptr %c.var, i32 0, i32 1
// CHECK:STDOUT: %.loc10_40.9.array.index = getelementptr inbounds [5 x {}], ptr %c.var, i32 0, i32 2
// CHECK:STDOUT: %.loc10_40.12.array.index = getelementptr inbounds [5 x {}], ptr %c.var, i32 0, i32 3
// CHECK:STDOUT: %.loc10_40.15.array.index = getelementptr inbounds [5 x {}], ptr %c.var, i32 0, i32 4
// CHECK:STDOUT: %d.var = alloca { i32, i32, i32 }, align 8
// CHECK:STDOUT: %.loc11_36.2.tuple.elem = getelementptr inbounds { i32, i32, i32 }, ptr %d.var, i32 0, i32 0
// CHECK:STDOUT: store i32 1, ptr %.loc11_36.2.tuple.elem, align 4
// CHECK:STDOUT: %.loc11_36.4.tuple.elem = getelementptr inbounds { i32, i32, i32 }, ptr %d.var, i32 0, i32 1
// CHECK:STDOUT: store i32 2, ptr %.loc11_36.4.tuple.elem, align 4
// CHECK:STDOUT: %.loc11_36.6.tuple.elem = getelementptr inbounds { i32, i32, i32 }, ptr %d.var, i32 0, i32 2
// CHECK:STDOUT: store i32 3, ptr %.loc11_36.6.tuple.elem, align 4
// CHECK:STDOUT: %e.var = alloca [3 x i32], align 4
// CHECK:STDOUT: %.loc12_21.1.tuple.elem = getelementptr inbounds { i32, i32, i32 }, ptr %d.var, i32 0, i32 0
// CHECK:STDOUT: %.loc12_21.2 = load i32, ptr %.loc12_21.1.tuple.elem, align 4
// CHECK:STDOUT: %.loc12_21.4.array.index = getelementptr inbounds [3 x i32], ptr %e.var, i32 0, i32 0
// CHECK:STDOUT: store i32 %.loc12_21.2, ptr %.loc12_21.4.array.index, align 4
// CHECK:STDOUT: %.loc12_21.6.tuple.elem = getelementptr inbounds { i32, i32, i32 }, ptr %d.var, i32 0, i32 1
// CHECK:STDOUT: %.loc12_21.7 = load i32, ptr %.loc12_21.6.tuple.elem, align 4
// CHECK:STDOUT: %.loc12_21.9.array.index = getelementptr inbounds [3 x i32], ptr %e.var, i32 0, i32 1
// CHECK:STDOUT: store i32 %.loc12_21.7, ptr %.loc12_21.9.array.index, align 4
// CHECK:STDOUT: %.loc12_21.11.tuple.elem = getelementptr inbounds { i32, i32, i32 }, ptr %d.var, i32 0, i32 2
// CHECK:STDOUT: %.loc12_21.12 = load i32, ptr %.loc12_21.11.tuple.elem, align 4
// CHECK:STDOUT: %.loc12_21.14.array.index = getelementptr inbounds [3 x i32], ptr %e.var, i32 0, i32 2
// CHECK:STDOUT: store i32 %.loc12_21.12, ptr %.loc12_21.14.array.index, align 4
// CHECK:STDOUT: ret void
// CHECK:STDOUT: }
toolchain/lower/testdata/array/function_param.carbon
Vendored
+14 -12
View File
@@ -16,19 +16,21 @@ fn G() -> i32 {
// CHECK:STDOUT: source_filename = "function_param.carbon"
// CHECK:STDOUT:
// CHECK:STDOUT: define i32 @F(ptr %arr, i32 %i) {
// CHECK:STDOUT: %array.index = getelementptr inbounds [3 x i32], ptr %arr, i32 0, i32 %i
// CHECK:STDOUT: %1 = load i32, ptr %array.index, align 4
// CHECK:STDOUT: ret i32 %1
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %.loc8_15.2.array.index = getelementptr inbounds [3 x i32], ptr %arr, i32 0, i32 %i
// CHECK:STDOUT: %.loc8_15.3 = load i32, ptr %.loc8_15.2.array.index, align 4
// CHECK:STDOUT: ret i32 %.loc8_15.3
// CHECK:STDOUT: }
// CHECK:STDOUT:
// CHECK:STDOUT: define i32 @G() {
// CHECK:STDOUT: %temp = alloca [3 x i32], align 4
// CHECK:STDOUT: %array.index = getelementptr inbounds [3 x i32], ptr %temp, i32 0, i32 0
// CHECK:STDOUT: store i32 1, ptr %array.index, align 4
// CHECK:STDOUT: %array.index1 = getelementptr inbounds [3 x i32], ptr %temp, i32 0, i32 1
// CHECK:STDOUT: store i32 2, ptr %array.index1, align 4
// CHECK:STDOUT: %array.index2 = getelementptr inbounds [3 x i32], ptr %temp, i32 0, i32 2
// CHECK:STDOUT: store i32 3, ptr %array.index2, align 4
// CHECK:STDOUT: %F = call i32 @F(ptr %temp, i32 1)
// CHECK:STDOUT: ret i32 %F
// CHECK:STDOUT: entry:
// CHECK:STDOUT: %.loc12_20.2.temp = alloca [3 x i32], align 4
// CHECK:STDOUT: %.loc12_20.4.array.index = getelementptr inbounds [3 x i32], ptr %.loc12_20.2.temp, i32 0, i32 0
// CHECK:STDOUT: store i32 1, ptr %.loc12_20.4.array.index, align 4
// CHECK:STDOUT: %.loc12_20.7.array.index = getelementptr inbounds [3 x i32], ptr %.loc12_20.2.temp, i32 0, i32 1
// CHECK:STDOUT: store i32 2, ptr %.loc12_20.7.array.index, align 4
// CHECK:STDOUT: %.loc12_20.10.array.index = getelementptr inbounds [3 x i32], ptr %.loc12_20.2.temp, i32 0, i32 2
// CHECK:STDOUT: store i32 3, ptr %.loc12_20.10.array.index, align 4
// CHECK:STDOUT: %F.call = call i32 @F(ptr %.loc12_20.2.temp, i32 1)
// CHECK:STDOUT: ret i32 %F.call
// CHECK:STDOUT: }