Commit 48821ea886e29c5568cd2036cd46ca435550aaa3 | zig

author	Ali Chraghi <alichraghi@proton.me> 2026-07-08 17:06:51+03:30
committer	Ali Chraghi <alichraghi@proton.me> 2026-07-10 11:39:54+03:30
log	48821ea886e29c5568cd2036cd46ca435550aaa3
tree	c85b326e9246fb71526873a261cb2ce8f66069e3
parent	c498b66434412616a97328a7f7a05014aa5183dc

spirv: always emit int64 cap for spirv64

3 files changed, 15 insertions(+), 8 deletions(-)

lib
- std
  - Target.zig
src
- codegen
  - spirv
    CodeGen.zig
- link
  - SpirV.zig

lib/std/Target.zig+2-1

...	@@ -2334,7 +2334,8 @@ pub fn supportsAddressSpace(	...	@@ -2334,7 +2334,8 @@ pub fn supportsAddressSpace(
2334	.constant => (is_gpu and (context == null or context == .constant)) or	2334	.constant => (is_gpu and (context == null or context == .constant)) or
2335	(is_spirv and (context == null or context == .constant or context == .pointer)),	2335	(is_spirv and (context == null or context == .constant or context == .pointer)),
2336	.param => is_nvptx,	2336	.param => is_nvptx,
2337	.input, .output, .uniform, .push_constant, .storage_buffer, .physical_storage_buffer => is_spirv,	2337	.input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,
		2338	.physical_storage_buffer => arch == .spirv64,
2338	.externref, .funcref => target.cpu.has(.wasm, .reference_types),	2339	.externref, .funcref => target.cpu.has(.wasm, .reference_types),
2339	};	2340	};
2340	}	2341	}

src/codegen/spirv/CodeGen.zig+7-4

 @@ -53,9 +53,12 @@ tracked_allocas: std.AutoHashMapUnmanaged(Id, ?Id) = .empty,
 loop_switches: std.AutoHashMapUnmanaged(Air.Inst.Index, LoopSwitch) = .empty,
 id_scratch: std.ArrayList(Id) = .empty,
+fn hasInt64(target: *const std.Target) bool {
+    return target.cpu.arch == .spirv64 or target.cpu.has(.spirv, .int64);
+}
 fn bigIntBits(cg: *const CodeGen) u16 {
-    const target = cg.zcu.getTarget();
+    return if (hasInt64(cg.zcu.getTarget())) 64 else 32;
-    return if (target.cpu.has(.spirv, .int64)) 64 else 32;
 }
 fn limbType(cg: *const CodeGen) Type {
 @@ -487,7 +490,7 @@ pub fn backingIntBits(cg: *const CodeGen, bits: u16) struct { u16, bool } {
         .{ .bits = 8, .enabled = target.cpu.has(.spirv, .int8) },
         .{ .bits = 16, .enabled = target.cpu.has(.spirv, .int16) },
         .{ .bits = 32, .enabled = true },
-        .{ .bits = 64, .enabled = target.cpu.has(.spirv, .int64) or target.cpu.arch == .spirv64 },
+        .{ .bits = 64, .enabled = hasInt64(target) },
     };
     for (ints) |int| {
 @@ -5273,7 +5276,7 @@ fn airMulOverflow(cg: *CodeGen, inst: Air.Inst.Index) !?Id {
     //   of the result too.
     const target = cg.zcu.getTarget();
-    const largest_int_bits: u16 = if (target.cpu.has(.spirv, .int64) or target.cpu.arch == .spirv64) 64 else 32;
+    const largest_int_bits: u16 = if (hasInt64(target)) 64 else 32;
     // If non-null, the number of bits that the multiplication should be performed in. If
     // null, we have to use wide multiplication.
     const maybe_op_ty_bits: ?u16 = switch (info.bits) {

src/link/SpirV.zig+6-3

 @@ -621,9 +621,12 @@ fn emitPreamble(
         },
         else => unreachable,
     }
-    if (target.os.tag == .vulkan and target.cpu.arch == .spirv64) {
+    if (target.cpu.arch == .spirv64) {
-        caps.insert(.physical_storage_buffer_addresses);
+        caps.insert(.int64);
-        try exts.put(gpa, "SPV_KHR_physical_storage_buffer", {});
+        if (target.os.tag == .vulkan) {
+            caps.insert(.physical_storage_buffer_addresses);
+            try exts.put(gpa, "SPV_KHR_physical_storage_buffer", {});
+        }
     }
     if (has_linkage) caps.insert(.linkage);