| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-03-18 21:30:06+01:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2025-03-20 13:34:04-07:00 |
| log | bfc554b542175bf21179804a269e3f65aff7fe18 |
| tree | 01b3ef6131526a56f444ad304e9405889d83e410 |
| parent | fbdf64a7dac93dfcb5aa0240477689c174906695 |
compiler: Support more GCC code models and fix the mapping to LLVM code models.
Closes #22517.3 files changed, 56 insertions(+), 15 deletions(-)
lib- std
lib/std/builtin.zig+8-3
| ... | @@ -141,11 +141,16 @@ pub const AtomicRmwOp = enum { | ... | @@ -141,11 +141,16 @@ pub const AtomicRmwOp = enum { |
| 141 | /// therefore must be kept in sync with the compiler implementation. | 141 | /// therefore must be kept in sync with the compiler implementation. |
| 142 | pub const CodeModel = enum { | 142 | pub const CodeModel = enum { |
| 143 | default, | 143 | default, |
| 144 | tiny, | 144 | extreme, |
| 145 | small, | ||
| 146 | kernel, | 145 | kernel, |
| 147 | medium, | ||
| 148 | large, | 146 | large, |
| 147 | medany, | ||
| 148 | medium, | ||
| 149 | medlow, | ||
| 150 | medmid, | ||
| 151 | normal, | ||
| 152 | small, | ||
| 153 | tiny, | ||
| 149 | }; | 154 | }; |
| 150 | 155 | ||
| 151 | /// This data structure is used by the Zig language code generation and | 156 | /// This data structure is used by the Zig language code generation and |
src/codegen/llvm.zig+36-9
| ... | @@ -771,6 +771,30 @@ const DataLayoutBuilder = struct { | ... | @@ -771,6 +771,30 @@ const DataLayoutBuilder = struct { |
| 771 | } | 771 | } |
| 772 | }; | 772 | }; |
| 773 | 773 | ||
| 774 | // Avoid depending on `llvm.CodeModel` in the bitcode-only case. | ||
| 775 | const CodeModel = enum { | ||
| 776 | default, | ||
| 777 | tiny, | ||
| 778 | small, | ||
| 779 | kernel, | ||
| 780 | medium, | ||
| 781 | large, | ||
| 782 | }; | ||
| 783 | |||
| 784 | fn codeModel(model: std.builtin.CodeModel, target: std.Target) CodeModel { | ||
| 785 | // Roughly match Clang's mapping of GCC code models to LLVM code models. | ||
| 786 | return switch (model) { | ||
| 787 | .default => .default, | ||
| 788 | .extreme, .large => .large, | ||
| 789 | .kernel => .kernel, | ||
| 790 | .medany => if (target.cpu.arch.isRISCV()) .medium else .large, | ||
| 791 | .medium => if (target.os.tag == .aix) .large else .medium, | ||
| 792 | .medmid => .medium, | ||
| 793 | .normal, .medlow, .small => .small, | ||
| 794 | .tiny => .tiny, | ||
| 795 | }; | ||
| 796 | } | ||
| 797 | |||
| 774 | pub const Object = struct { | 798 | pub const Object = struct { |
| 775 | gpa: Allocator, | 799 | gpa: Allocator, |
| 776 | builder: Builder, | 800 | builder: Builder, |
| ... | @@ -1135,14 +1159,17 @@ pub const Object = struct { | ... | @@ -1135,14 +1159,17 @@ pub const Object = struct { |
| 1135 | module_flags.appendAssumeCapacity(try o.builder.metadataModuleFlag( | 1159 | module_flags.appendAssumeCapacity(try o.builder.metadataModuleFlag( |
| 1136 | behavior_error, | 1160 | behavior_error, |
| 1137 | try o.builder.metadataString("Code Model"), | 1161 | try o.builder.metadataString("Code Model"), |
| 1138 | try o.builder.metadataConstant(try o.builder.intConst(.i32, @as(i32, switch (comp.root_mod.code_model) { | 1162 | try o.builder.metadataConstant(try o.builder.intConst(.i32, @as( |
| 1139 | .tiny => 0, | 1163 | i32, |
| 1140 | .small => 1, | 1164 | switch (codeModel(comp.root_mod.code_model, comp.root_mod.resolved_target.result)) { |
| 1141 | .kernel => 2, | 1165 | .default => unreachable, |
| 1142 | .medium => 3, | 1166 | .tiny => 0, |
| 1143 | .large => 4, | 1167 | .small => 1, |
| 1144 | else => unreachable, | 1168 | .kernel => 2, |
| 1145 | }))), | 1169 | .medium => 3, |
| 1170 | .large => 4, | ||
| 1171 | }, | ||
| 1172 | ))), | ||
| 1146 | )); | 1173 | )); |
| 1147 | } | 1174 | } |
| 1148 | 1175 | ||
| ... | @@ -1294,7 +1321,7 @@ pub const Object = struct { | ... | @@ -1294,7 +1321,7 @@ pub const Object = struct { |
| 1294 | else | 1321 | else |
| 1295 | .Static; | 1322 | .Static; |
| 1296 | 1323 | ||
| 1297 | const code_model: llvm.CodeModel = switch (comp.root_mod.code_model) { | 1324 | const code_model: llvm.CodeModel = switch (codeModel(comp.root_mod.code_model, comp.root_mod.resolved_target.result)) { |
| 1298 | .default => .Default, | 1325 | .default => .Default, |
| 1299 | .tiny => .Tiny, | 1326 | .tiny => .Tiny, |
| 1300 | .small => .Small, | 1327 | .small => .Small, |
src/main.zig+12-3
| ... | @@ -499,9 +499,18 @@ const usage_build_generic = | ... | @@ -499,9 +499,18 @@ const usage_build_generic = |
| 499 | \\ hex (planned feature) Intel IHEX | 499 | \\ hex (planned feature) Intel IHEX |
| 500 | \\ raw (planned feature) Dump machine code directly | 500 | \\ raw (planned feature) Dump machine code directly |
| 501 | \\ -mcpu [cpu] Specify target CPU and feature set | 501 | \\ -mcpu [cpu] Specify target CPU and feature set |
| 502 | \\ -mcmodel=[default|tiny| Limit range of code and data virtual addresses | 502 | \\ -mcmodel=[model] Limit range of code and data virtual addresses |
| 503 | \\ small|kernel| | 503 | \\ default |
| 504 | \\ medium|large] | 504 | \\ extreme |
| 505 | \\ kernel | ||
| 506 | \\ large | ||
| 507 | \\ medany | ||
| 508 | \\ medium | ||
| 509 | \\ medlow | ||
| 510 | \\ medmid | ||
| 511 | \\ normal | ||
| 512 | \\ small | ||
| 513 | \\ tiny | ||
| 505 | \\ -mred-zone Force-enable the "red-zone" | 514 | \\ -mred-zone Force-enable the "red-zone" |
| 506 | \\ -mno-red-zone Force-disable the "red-zone" | 515 | \\ -mno-red-zone Force-disable the "red-zone" |
| 507 | \\ -fomit-frame-pointer Omit the stack frame pointer | 516 | \\ -fomit-frame-pointer Omit the stack frame pointer |