Merge pull request ziglang#24768 from alichraghi/spv5

spirv: remove prune_unused ISel

Author: alexrp

src/codegen/spirv/CodeGen.zig

@@ -676,8 +676,9 @@ pub fn structType(
     ip_index: InternPool.Index,
 ) !Id {
     const target = module.zcu.getTarget();
+    const actual_ip_index = if (module.zcu.comp.config.root_strip) .none else ip_index;
 
-    if (module.cache.struct_types.get(.{ .fields = types, .ip_index = ip_index })) |id| return id;
+    if (module.cache.struct_types.get(.{ .fields = types, .ip_index = actual_ip_index })) |id| return id;
     const result_id = module.allocId();
     const types_dup = try module.arena.dupe(Id, types);
     try module.sections.globals.emit(module.gpa, .OpTypeStruct, .{
@@ -710,10 +711,7 @@ pub fn structType(
 
     try module.cache.struct_types.put(
         module.gpa,
-        .{
-            .fields = types_dup,
-            .ip_index = if (module.zcu.comp.config.root_strip) .none else ip_index,
-        },
+        .{ .fields = types_dup, .ip_index = actual_ip_index },
         result_id,
     );
     return result_id;
@@ -874,19 +872,22 @@ pub fn declareEntryPoint(
 }
 
 pub fn debugName(module: *Module, target: Id, name: []const u8) !void {
+    if (module.zcu.comp.config.root_strip) return;
     try module.sections.debug_names.emit(module.gpa, .OpName, .{
         .target = target,
         .name = name,
     });
 }
 
 pub fn debugNameFmt(module: *Module, target: Id, comptime fmt: []const u8, args: anytype) !void {
+    if (module.zcu.comp.config.root_strip) return;
     const name = try std.fmt.allocPrint(module.gpa, fmt, args);
     defer module.gpa.free(name);
     try module.debugName(target, name);
 }
 
 pub fn memberDebugName(module: *Module, target: Id, member: u32, name: []const u8) !void {
+    if (module.zcu.comp.config.root_strip) return;
     try module.sections.debug_names.emit(module.gpa, .OpMemberName, .{
         .type = target,
         .member = member,

src/codegen/spirv/Module.zig

@@ -10,10 +10,11 @@ const Compilation = @import("../Compilation.zig");
 const link = @import("../link.zig");
 const Air = @import("../Air.zig");
 const Type = @import("../Type.zig");
-const BinaryModule = @import("SpirV/BinaryModule.zig");
 const CodeGen = @import("../codegen/spirv/CodeGen.zig");
 const Module = @import("../codegen/spirv/Module.zig");
 const trace = @import("../tracy.zig").trace;
+const BinaryModule = @import("SpirV/BinaryModule.zig");
+const lower_invocation_globals = @import("SpirV/lower_invocation_globals.zig");
 
 const spec = @import("../codegen/spirv/spec.zig");
 const Id = spec.Id;
@@ -279,7 +280,7 @@ pub fn flush(
     const module = try linker.module.finalize(arena);
     errdefer arena.free(module);
 
-    const linked_module = linker.linkModule(arena, module, sub_prog_node) catch |err| switch (err) {
+    const linked_module = linkModule(arena, module, sub_prog_node) catch |err| switch (err) {
         error.OutOfMemory => return error.OutOfMemory,
         else => |other| return diags.fail("error while linking: {s}", .{@errorName(other)}),
     };
@@ -288,18 +289,10 @@ pub fn flush(
         return diags.fail("failed to write: {s}", .{@errorName(err)});
 }
 
-fn linkModule(linker: *Linker, arena: Allocator, module: []Word, progress: std.Progress.Node) ![]Word {
-    _ = linker;
-
-    const lower_invocation_globals = @import("SpirV/lower_invocation_globals.zig");
-    const prune_unused = @import("SpirV/prune_unused.zig");
-
+fn linkModule(arena: Allocator, module: []Word, progress: std.Progress.Node) ![]Word {
     var parser = try BinaryModule.Parser.init(arena);
     defer parser.deinit();
     var binary = try parser.parse(module);
-
     try lower_invocation_globals.run(&parser, &binary, progress);
-    try prune_unused.run(&parser, &binary, progress);
-
     return binary.finalize(arena);
 }

src/link/SpirV.zig

@@ -382,6 +382,15 @@ const ModuleBuilder = struct {
         var it = binary.iterateInstructions();
         while (it.next()) |inst| {
             switch (inst.opcode) {
+                .OpName => {
+                    const id: ResultId = @enumFromInt(inst.operands[0]);
+                    if (info.invocation_globals.contains(id)) continue;
+                },
+                .OpExtInstImport => {
+                    const set_id: ResultId = @enumFromInt(inst.operands[0]);
+                    const set = binary.ext_inst_map.get(set_id).?;
+                    if (set == .zig) continue;
+                },
                 .OpExtInst => {
                     const set_id: ResultId = @enumFromInt(inst.operands[2]);
                     const set_inst = inst.operands[3];
@@ -482,7 +491,7 @@ const ModuleBuilder = struct {
         return entry.value_ptr.*;
     }
 
-    /// Rewrite the modules' functions and emit them with the new parameter types.
+    /// Rewrite the modules functions and emit them with the new parameter types.
     fn rewriteFunctions(
         self: *ModuleBuilder,
         parser: *BinaryModule.Parser,