Commit d1901c744c9bf2862f99be837325e0a50365c38b | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2024-09-20 10:26:49+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-09-23 17:17:25-07:00
log	d1901c744c9bf2862f99be837325e0a50365c38b
tree	fed4532aba4e3c8f21ec3a96a5fa8b58dc89c534
parent	b2c53eb0d717989caf66dc8dfc0a7b1afb2607b3

std.Target: Remove Cpu.Arch.dxil and ObjectFormat.dxcontainer.

See: https://devblogs.microsoft.com/directx/directx-adopting-spir-v

Since we never hooked up the (experimental) DirectX LLVM backend, we've never
actually supported targeting DXIL in Zig. With Microsoft moving away from DXIL,
that seems very unlikely to change.

10 files changed, 21 insertions(+), 88 deletions(-)

lib
- compiler
  - aro
    aro
    target.zig
- std
  - Target.zig
  - zig.zig
  - zig
    LibCDirs.zig
src
- Compilation
  - Config.zig
- Type.zig
- Zcu.zig
- codegen
  - llvm.zig
- link.zig
- target.zig

lib/compiler/aro/aro/target.zig-18

 @@ -482,7 +482,6 @@ pub fn get32BitArchVariant(target: std.Target) ?std.Target {
         .spirv,
         .spirv32,
         .loongarch32,
-        .dxil,
         .xtensa,
         => {}, // Already 32 bit
 @@ -509,7 +508,6 @@ pub fn get64BitArchVariant(target: std.Target) ?std.Target {
         .arc,
         .avr,
         .csky,
-        .dxil,
         .hexagon,
         .kalimba,
         .lanai,
 @@ -578,7 +576,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 {
         .bpfel => "bpfel",
         .bpfeb => "bpfeb",
         .csky => "csky",
-        .dxil => "dxil",
         .hexagon => "hexagon",
         .loongarch32 => "loongarch32",
         .loongarch64 => "loongarch64",
 @@ -702,21 +699,6 @@ pub fn toLLVMTriple(target: std.Target, buf: []u8) []const u8 {
         .cygnus => "cygnus",
         .simulator => "simulator",
         .macabi => "macabi",
-        .pixel => "pixel",
-        .vertex => "vertex",
-        .geometry => "geometry",
-        .hull => "hull",
-        .domain => "domain",
-        .compute => "compute",
-        .library => "library",
-        .raygeneration => "raygeneration",
-        .intersection => "intersection",
-        .anyhit => "anyhit",
-        .closesthit => "closesthit",
-        .miss => "miss",
-        .callable => "callable",
-        .mesh => "mesh",
-        .amplification => "amplification",
         .ohos => "openhos",
     };
     writer.writeAll(llvm_abi) catch unreachable;

lib/std/Target.zig+20-28

 @@ -673,26 +673,26 @@ pub const Abi = enum {
     cygnus,
     simulator,
     macabi,
-    pixel,
-    vertex,
-    geometry,
-    hull,
-    domain,
-    compute,
-    library,
-    raygeneration,
-    intersection,
-    anyhit,
-    closesthit,
-    miss,
-    callable,
-    mesh,
-    amplification,
     ohos,
     // LLVM tags deliberately omitted:
-    // - gnuf64
+    // - amplification
+    // - anyhit
+    // - callable
+    // - closesthit
+    // - compute
     // - coreclr
+    // - domain
+    // - geometry
+    // - gnuf64
+    // - hull
+    // - intersection
+    // - library
+    // - mesh
+    // - miss
+    // - pixel
+    // - raygeneration
+    // - vertex
     pub fn default(arch: Cpu.Arch, os: Os) Abi {
         return if (arch.isWasm()) .musl else switch (os.tag) {
 @@ -788,8 +788,6 @@ pub const ObjectFormat = enum {
     c,
     /// The Common Object File Format used by Windows and UEFI.
     coff,
-    /// The DirectX Container format containing either DXIL or DXBC.
-    dxcontainer,
     /// The Executable and Linkable Format used by many Unixes.
     elf,
     /// The Generalized Object File Format used by z/OS.
 @@ -811,11 +809,13 @@ pub const ObjectFormat = enum {
     /// The eXtended Common Object File Format used by AIX.
     xcoff,
+    // LLVM tags deliberately omitted:
+    // - dxcontainer
     pub fn fileExt(of: ObjectFormat, arch: Cpu.Arch) [:0]const u8 {
         return switch (of) {
             .c => ".c",
             .coff => ".obj",
-            .dxcontainer => ".dxil",
             .elf, .goff, .macho, .wasm, .xcoff => ".o",
             .hex => ".ihex",
             .nvptx => ".ptx",
 @@ -833,7 +833,6 @@ pub const ObjectFormat = enum {
             .uefi, .windows => .coff,
             .zos => .goff,
             else => switch (arch) {
-                .dxil => .dxcontainer,
                 .nvptx, .nvptx64 => .nvptx,
                 .spirv, .spirv32, .spirv64 => .spirv,
                 .wasm32, .wasm64 => .wasm,
 @@ -873,7 +872,6 @@ pub fn toElfMachine(target: Target) std.elf.EM {
         .xcore => .XCORE,
         .xtensa => .XTENSA,
-        .dxil,
         .nvptx,
         .nvptx64,
         .spirv,
 @@ -907,7 +905,6 @@ pub fn toCoffMachine(target: Target) std.coff.MachineType {
         .bpfel,
         .bpfeb,
         .csky,
-        .dxil,
         .hexagon,
         .kalimba,
         .lanai,
 @@ -1133,7 +1130,6 @@ pub const Cpu = struct {
         bpfel,
         bpfeb,
         csky,
-        dxil,
         hexagon,
         kalimba,
         lanai,
 @@ -1172,6 +1168,7 @@ pub const Cpu = struct {
         // - aarch64_32
         // - amdil
         // - amdil64
+        // - dxil
         // - le32
         // - le64
         // - r600
 @@ -1344,7 +1341,6 @@ pub const Cpu = struct {
                 .spirv,
                 .spirv32,
                 .spirv64,
-                .dxil,
                 .loongarch32,
                 .loongarch64,
                 .arc,
 @@ -1817,7 +1813,6 @@ pub const DynamicLinker = struct {
                 .kalimba,
                 .lanai,
                 .ve,
-                .dxil,
                 .loongarch32,
                 .xtensa,
                 => none,
 @@ -1913,7 +1908,6 @@ pub fn ptrBitWidth_cpu_abi(cpu: Cpu, abi: Abi) u16 {
         .sparc,
         .spirv32,
         .loongarch32,
-        .dxil,
         .xtensa,
         => 32,
 @@ -2415,7 +2409,6 @@ pub fn cTypeAlignment(target: Target, c_type: CType) u16 {
             .csky,
             .x86,
             .xcore,
-            .dxil,
             .loongarch32,
             .kalimba,
             .spu_2,
 @@ -2519,7 +2512,6 @@ pub fn cTypePreferredAlignment(target: Target, c_type: CType) u16 {
             .csky,
             .xcore,
-            .dxil,
             .loongarch32,
             .kalimba,
             .spu_2,

lib/std/zig.zig-1

...	@@ -233,7 +233,6 @@ pub fn binNameAlloc(allocator: Allocator, options: BinNameOptions) error{OutOfMe	...	@@ -233,7 +233,6 @@ pub fn binNameAlloc(allocator: Allocator, options: BinNameOptions) error{OutOfMe
233	}),	233	}),
234	},	234	},
235	.nvptx => return std.fmt.allocPrint(allocator, "{s}.ptx", .{root_name}),	235	.nvptx => return std.fmt.allocPrint(allocator, "{s}.ptx", .{root_name}),
236	.dxcontainer => return std.fmt.allocPrint(allocator, "{s}.dxil", .{root_name}),
237	}	236	}
238	}	237	}
239		238

lib/std/zig/LibCDirs.zig-17

...	@@ -254,23 +254,6 @@ fn libCGenericName(target: std.Target) [:0]const u8 {	...	@@ -254,23 +254,6 @@ fn libCGenericName(target: std.Target) [:0]const u8 {
254	.simulator,	254	.simulator,
255	.macabi,	255	.macabi,
256	=> unreachable,	256	=> unreachable,
257
258	.pixel,
259	.vertex,
260	.geometry,
261	.hull,
262	.domain,
263	.compute,
264	.library,
265	.raygeneration,
266	.intersection,
267	.anyhit,
268	.closesthit,
269	.miss,
270	.callable,
271	.mesh,
272	.amplification,
273	=> unreachable,
274	}	257	}
275	}	258	}
276		259

src/Compilation/Config.zig+1-1

...	@@ -440,7 +440,7 @@ pub fn resolve(options: Options) ResolveError!Config {	...	@@ -440,7 +440,7 @@ pub fn resolve(options: Options) ResolveError!Config {
440	.windows, .uefi => .code_view,	440	.windows, .uefi => .code_view,
441	else => .{ .dwarf = .@"32" },	441	else => .{ .dwarf = .@"32" },
442	},	442	},
443	.spirv, .nvptx, .dxcontainer, .hex, .raw, .plan9 => .strip,	443	.spirv, .nvptx, .hex, .raw, .plan9 => .strip,
444	};	444	};
445	};	445	};
446		446

src/Type.zig-1

...	@@ -1703,7 +1703,6 @@ pub fn maxIntAlignment(target: std.Target, use_llvm: bool) u16 {	...	@@ -1703,7 +1703,6 @@ pub fn maxIntAlignment(target: std.Target, use_llvm: bool) u16 {
1703	.spirv32,	1703	.spirv32,
1704	.ve,	1704	.ve,
1705	.spirv64,	1705	.spirv64,
1706	.dxil,
1707	.loongarch32,	1706	.loongarch32,
1708	.loongarch64,	1707	.loongarch64,
1709	.xtensa,	1708	.xtensa,

src/Zcu.zig-1

...	@@ -3010,7 +3010,6 @@ pub fn atomicPtrAlignment(	...	@@ -3010,7 +3010,6 @@ pub fn atomicPtrAlignment(
3010	.wasm32,	3010	.wasm32,
3011	.csky,	3011	.csky,
3012	.spirv32,	3012	.spirv32,
3013	.dxil,
3014	.loongarch32,	3013	.loongarch32,
3015	.xtensa,	3014	.xtensa,
3016	=> 32,	3015	=> 32,

src/codegen/llvm.zig-18

 @@ -51,7 +51,6 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 {
         .bpfel => "bpfel",
         .bpfeb => "bpfeb",
         .csky => "csky",
-        .dxil => "dxil",
         .hexagon => "hexagon",
         .loongarch32 => "loongarch32",
         .loongarch64 => "loongarch64",
 @@ -182,21 +181,6 @@ pub fn targetTriple(allocator: Allocator, target: std.Target) ![]const u8 {
         .cygnus => "cygnus",
         .simulator => "simulator",
         .macabi => "macabi",
-        .pixel => "pixel",
-        .vertex => "vertex",
-        .geometry => "geometry",
-        .hull => "hull",
-        .domain => "domain",
-        .compute => "compute",
-        .library => "library",
-        .raygeneration => "raygeneration",
-        .intersection => "intersection",
-        .anyhit => "anyhit",
-        .closesthit => "closesthit",
-        .miss => "miss",
-        .callable => "callable",
-        .mesh => "mesh",
-        .amplification => "amplification",
         .ohos => "ohos",
     };
     try llvm_triple.appendSlice(llvm_abi);
 @@ -263,7 +247,6 @@ pub fn targetArch(arch_tag: std.Target.Cpu.Arch) llvm.ArchType {
         .bpfel => .bpfel,
         .bpfeb => .bpfeb,
         .csky => .csky,
-        .dxil => .dxil,
         .hexagon => .hexagon,
         .loongarch32 => .loongarch32,
         .loongarch64 => .loongarch64,
 @@ -12726,7 +12709,6 @@ pub fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void {
         .spirv,
         .spirv32,
         .spirv64,
-        .dxil,
         => {},
         // LLVM does does not have a backend for these.

src/link.zig-1

...	@@ -932,7 +932,6 @@ pub const File = struct {	...	@@ -932,7 +932,6 @@ pub const File = struct {
932	.xcoff => @panic("TODO implement xcoff object format"),	932	.xcoff => @panic("TODO implement xcoff object format"),
933	.hex => @panic("TODO implement hex object format"),	933	.hex => @panic("TODO implement hex object format"),
934	.raw => @panic("TODO implement raw object format"),	934	.raw => @panic("TODO implement raw object format"),
935	.dxcontainer => @panic("TODO implement dxcontainer object format"),
936	};	935	};
937	}	936	}
938		937

src/target.zig-2

...	@@ -104,7 +104,6 @@ pub fn hasLlvmSupport(target: std.Target, ofmt: std.Target.ObjectFormat) bool {	...	@@ -104,7 +104,6 @@ pub fn hasLlvmSupport(target: std.Target, ofmt: std.Target.ObjectFormat) bool {
104	=> return false,	104	=> return false,
105		105
106	.coff,	106	.coff,
107	.dxcontainer,
108	.elf,	107	.elf,
109	.goff,	108	.goff,
110	.hex,	109	.hex,
...	@@ -161,7 +160,6 @@ pub fn hasLlvmSupport(target: std.Target, ofmt: std.Target.ObjectFormat) bool {	...	@@ -161,7 +160,6 @@ pub fn hasLlvmSupport(target: std.Target, ofmt: std.Target.ObjectFormat) bool {
161	=> true,	160	=> true,
162		161
163	// An LLVM backend exists but we don't currently support using it.	162	// An LLVM backend exists but we don't currently support using it.
164	.dxil,
165	.spirv,	163	.spirv,
166	.spirv32,	164	.spirv32,
167	.spirv64,	165	.spirv64,