dedup OpVariable: remove OpVariable name from dedup key

Author: Firestar99

crates/rustc_codegen_spirv/src/linker/duplicates.rs

@@ -3,7 +3,6 @@ use rspirv::binary::Assemble;
 use rspirv::dr::{Instruction, Module, Operand};
 use rspirv::spirv::{Op, Word};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_middle::bug;
 use smallvec::SmallVec;
 use std::collections::hash_map;
 use std::mem;
@@ -104,24 +103,10 @@ fn gather_annotations(annotations: &[Instruction]) -> FxHashMap<Word, Vec<u32>>
         .collect()
 }
 
-fn gather_names(debug_names: &[Instruction]) -> FxHashMap<Word, String> {
-    debug_names
-        .iter()
-        .filter(|inst| inst.class.opcode == Op::Name)
-        .map(|inst| {
-            (
-                inst.operands[0].unwrap_id_ref(),
-                inst.operands[1].unwrap_literal_string().to_owned(),
-            )
-        })
-        .collect()
-}
-
 fn make_dedupe_key(
     inst: &Instruction,
     unresolved_forward_pointers: &FxHashSet<Word>,
     annotations: &FxHashMap<Word, Vec<u32>>,
-    names: &FxHashMap<Word, String>,
 ) -> Vec<u32> {
     let mut data = vec![inst.class.opcode as u32];
 
@@ -144,29 +129,10 @@ fn make_dedupe_key(
             op.assemble_into(&mut data);
         }
     }
-    if let Some(id) = inst.result_id {
-        if let Some(annos) = annotations.get(&id) {
-            data.extend_from_slice(annos);
-        }
-        if inst.class.opcode == Op::Variable {
-            // Names only matter for OpVariable.
-            if let Some(name) = names.get(&id) {
-                // Jump through some hoops to shove a String into a Vec<u32>.
-                //
-                // FIXME(eddyb) this should `.assemble_into(&mut data)` the
-                // `Operand::LiteralString(...)` from the original `Op::Name`.
-                for chunk in name.as_bytes().chunks(4) {
-                    let slice = match *chunk {
-                        [a] => [a, 0, 0, 0],
-                        [a, b] => [a, b, 0, 0],
-                        [a, b, c] => [a, b, c, 0],
-                        [a, b, c, d] => [a, b, c, d],
-                        _ => bug!(),
-                    };
-                    data.push(u32::from_le_bytes(slice));
-                }
-            }
-        }
+    if let Some(id) = inst.result_id
+        && let Some(annos) = annotations.get(&id)
+    {
+        data.extend_from_slice(annos);
     }
 
     data
@@ -198,7 +164,6 @@ pub fn remove_duplicate_types(module: &mut Module) {
 
     // Collect a map from type ID to an annotation "key blob" (to append to the type key)
     let annotations = gather_annotations(&module.annotations);
-    let names = gather_names(&module.debug_names);
 
     for inst in &mut module.types_global_values {
         if inst.class.opcode == Op::TypeForwardPointer
@@ -222,7 +187,7 @@ pub fn remove_duplicate_types(module: &mut Module) {
         // all_inst_iter_mut pass below. However, the code is a lil bit cleaner this way I guess.
         rewrite_inst_with_rules(inst, &rewrite_rules);
 
-        let key = make_dedupe_key(inst, &unresolved_forward_pointers, &annotations, &names);
+        let key = make_dedupe_key(inst, &unresolved_forward_pointers, &annotations);
 
         match key_to_result_id.entry(key) {
             hash_map::Entry::Vacant(entry) => {

tests/compiletests/ui/entry/duplicate/attr_duplicate.stderr

@@ -1,37 +1,26 @@
 OpCapability Shader
 OpMemoryModel Logical Simple
-OpEntryPoint GLCompute %1 "entry_1" %2 %3
+OpEntryPoint GLCompute %1 "entry_1" %2
 OpExecutionMode %1 LocalSize 1 1 1
-OpName %3 "_local_id2"
-OpName %5 "attr_duplicate::entry_1"
+OpName %4 "attr_duplicate::entry_1"
 OpDecorate %2 BuiltIn LocalInvocationIndex
-OpDecorate %3 BuiltIn LocalInvocationIndex
-%6 = OpTypeInt 32 0
-%7 = OpTypePointer Input %6
-%8 = OpTypeVoid
-%9 = OpTypeFunction %8
-%2 = OpVariable  %7  Input
-%3 = OpVariable  %7  Input
-%10 = OpTypeFunction %8 %6 %6
-%1 = OpFunction  %8  None %9
-%11 = OpLabel
-%12 = OpLoad  %6  %2
-%13 = OpLoad  %6  %3
-%14 = OpFunctionCall  %8  %5 %12 %13
+%5 = OpTypeInt 32 0
+%6 = OpTypePointer Input %5
+%7 = OpTypeVoid
+%8 = OpTypeFunction %7
+%2 = OpVariable  %6  Input
+%9 = OpTypeFunction %7 %5 %5
+%1 = OpFunction  %7  None %8
+%10 = OpLabel
+%11 = OpLoad  %5  %2
+%12 = OpLoad  %5  %2
+%13 = OpFunctionCall  %7  %4 %11 %12
 OpNoLine
 OpReturn
 OpFunctionEnd
-%5 = OpFunction  %8  None %10
-%15 = OpFunctionParameter  %6
-%16 = OpFunctionParameter  %6
-%17 = OpLabel
+%4 = OpFunction  %7  None %9
+%14 = OpFunctionParameter  %5
+%15 = OpFunctionParameter  %5
+%16 = OpLabel
 OpReturn
 OpFunctionEnd
-error: error:0:0 - [VUID-StandaloneSpirv-OpEntryPoint-09658] OpEntryPoint contains duplicate input variables with LocalInvocationIndex builtin
-         %_local_id2 = OpVariable %_ptr_Input_uint Input
-   |
-   = note: spirv-val failed
-   = note: module `$TEST_BUILD_DIR/entry/duplicate/attr_duplicate.vulkan1.2`
-
-error: aborting due to 1 previous error
-

tests/compiletests/ui/entry/duplicate/builtin_duplicate_std_attr.stderr

@@ -1,37 +1,27 @@
 OpCapability Shader
 OpMemoryModel Logical Simple
-OpEntryPoint GLCompute %1 "entry_1" %2 %3
+OpEntryPoint GLCompute %1 "entry_1" %2
 OpExecutionMode %1 LocalSize 1 1 1
 OpName %2 "_local_idx"
-OpName %6 "builtin_duplicate_std_attr::entry_1"
+OpName %5 "builtin_duplicate_std_attr::entry_1"
 OpDecorate %2 BuiltIn LocalInvocationIndex
-OpDecorate %3 BuiltIn LocalInvocationIndex
-%7 = OpTypeInt 32 0
-%8 = OpTypePointer Input %7
-%9 = OpTypeVoid
-%10 = OpTypeFunction %9
-%2 = OpVariable  %8  Input
-%11 = OpTypeFunction %9 %7
-%3 = OpVariable  %8  Input
-%1 = OpFunction  %9  None %10
-%12 = OpLabel
-%13 = OpLoad  %7  %2
-%14 = OpFunctionCall  %9  %6 %13
+%6 = OpTypeInt 32 0
+%7 = OpTypePointer Input %6
+%8 = OpTypeVoid
+%9 = OpTypeFunction %8
+%2 = OpVariable  %7  Input
+%10 = OpTypeFunction %8 %6
+%1 = OpFunction  %8  None %9
+%11 = OpLabel
+%12 = OpLoad  %6  %2
+%13 = OpFunctionCall  %8  %5 %12
 OpNoLine
 OpReturn
 OpFunctionEnd
-%6 = OpFunction  %9  None %11
-%15 = OpFunctionParameter  %7
-%16 = OpLabel
-%17 = OpLoad  %7  %3
+%5 = OpFunction  %8  None %10
+%14 = OpFunctionParameter  %6
+%15 = OpLabel
+%16 = OpLoad  %6  %2
 OpNoLine
 OpReturn
 OpFunctionEnd
-error: error:0:0 - [VUID-StandaloneSpirv-OpEntryPoint-09658] OpEntryPoint contains duplicate input variables with LocalInvocationIndex builtin
-         %gl_LocalInvocationIndex = OpVariable %_ptr_Input_uint Input
-   |
-   = note: spirv-val failed
-   = note: module `$TEST_BUILD_DIR/entry/duplicate/builtin_duplicate_std_attr.vulkan1.2`
-
-error: aborting due to 1 previous error
-