fixes

Author: molikto

crates/rustc_codegen_spirv/src/linker/inline.rs

@@ -35,13 +35,11 @@ pub fn inline(sess: &Session, module: &mut Module) -> super::Result<()> {
     // Drop all the functions we'll be inlining. (This also means we won't waste time processing
     // inlines in functions that will get inlined)
     let mut dropped_ids = FxHashSet::default();
+    let mut inlined_dont_inlines = Vec::new();
     module.functions.retain(|f| {
         if should_inline(&disallowed_argument_types, &disallowed_return_types, f) {
             if has_dont_inline(f) {
-                sess.warn(&format!(
-                    "Function `{}` has `dont_inline` attribute, but need to be inlined because it has illegal argument or return types",
-                    get_name(&get_names(module), f.def_id().unwrap())
-                ));
+                inlined_dont_inlines.push(f.def_id().unwrap());
             }
             // TODO: We should insert all defined IDs in this function.
             dropped_ids.insert(f.def_id().unwrap());
@@ -50,6 +48,16 @@ pub fn inline(sess: &Session, module: &mut Module) -> super::Result<()> {
             true
         }
     });
+    if !inlined_dont_inlines.is_empty() {
+        let names = get_names(module);
+        for f in inlined_dont_inlines {
+            sess.warn(&format!(
+                    "Function `{}` has `dont_inline` attribute, but need to be inlined because it has illegal argument or return types",
+                    get_name(&names, f)
+                ));
+        }
+    }
+
     // Drop OpName etc. for inlined functions
     module.debug_names.retain(|inst| {
         !inst.operands.iter().any(|op| {
@@ -208,15 +216,12 @@ fn compute_disallowed_argument_and_return_types(
     (disallowed_argument_types, disallowed_return_types)
 }
 
-fn has_dont_inline(
-    function: &Function,
-) -> bool {
+fn has_dont_inline(function: &Function) -> bool {
     let def = function.def.as_ref().unwrap();
     let control = def.operands[0].unwrap_function_control();
     control.contains(FunctionControl::DONT_INLINE)
 }
 
-
 fn should_inline(
     disallowed_argument_types: &FxHashSet<Word>,
     disallowed_return_types: &FxHashSet<Word>,

crates/rustc_codegen_spirv/src/linker/inline_globals.rs

@@ -1,6 +1,5 @@
-use rspirv::binary::Disassemble;
 use rspirv::dr::{Instruction, Module, Operand};
-use rspirv::spirv::{Op, StorageClass};
+use rspirv::spirv::{Op};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_session::Session;
 
@@ -83,20 +82,20 @@ pub fn inline_global_varaibles(sess: &Session, module: &mut Module) -> super::Re
     let mut has_run = false;
     //std::fs::write("res0.txt", module.disassemble());
     while cont {
-        cont = inline_global_varaibles_rec(sess, module)?;
+        cont = inline_global_varaibles_rec(module)?;
         has_run = has_run || cont;
         i += 1;
         //std::fs::write(format!("res{}.txt", i), module.disassemble());
     }
     // needed because inline global create duplicate types...
     if has_run {
         let _timer = sess.timer("link_remove_duplicate_types_round_2");
-        super::duplicates::remove_duplicate_types(&mut module);
+        super::duplicates::remove_duplicate_types(module);
     }
     Ok(())
 }
 
-fn inline_global_varaibles_rec(sess: &Session, module: &mut Module) -> super::Result<bool> {
+fn inline_global_varaibles_rec(module: &mut Module) -> super::Result<bool> {
     // first collect global stuff
     let mut variables: FxHashSet<u32> = FxHashSet::default();
     let mut function_types: FxHashMap<u32, Instruction> = FxHashMap::default();

crates/rustc_codegen_spirv/src/linker/mod.rs

@@ -218,12 +218,6 @@ pub fn link(sess: &Session, mut inputs: Vec<Module>, opts: &Options) -> Result<L
         );
     }
 
-    // this is needed so we can inline more global variables
-    // {
-    //     let _timer = sess.timer("simpl_op_store_var");
-    //     simpl_op_store_var::simpl_op_store_var(sess, &mut output)?;
-    // }
-
     {
         let _timer = sess.timer("link_inline_global");
         inline_globals::inline_global_varaibles(sess, &mut output)?;

tests/ui/dis/index_user_dst.stderr

@@ -1,34 +1,6 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 7 12
-%6 = OpAccessChain  %7  %8 %9
-%10 = OpArrayLength  %11  %8 0
-OpLine %5 8 21
-%12 = OpULessThan  %13  %9 %10
-OpLine %5 8 21
-OpSelectionMerge %14 None
-OpBranchConditional %12 %15 %16
-%15 = OpLabel
-OpLine %5 8 21
-%17 = OpInBoundsAccessChain  %18  %6 %9
-%19 = OpLoad  %20  %17
-OpLine %5 10 1
+OpLine %5 7 0
+%6 = OpFunctionCall  %2  %7
 OpReturn
-%16 = OpLabel
-OpLine %5 8 21
-OpBranch %21
-%21 = OpLabel
-OpBranch %22
-%22 = OpLabel
-%23 = OpPhi  %13  %24 %21 %24 %25
-OpLoopMerge %26 %25 None
-OpBranchConditional %23 %27 %26
-%27 = OpLabel
-OpBranch %25
-%25 = OpLabel
-OpBranch %22
-%26 = OpLabel
-OpUnreachable
-%14 = OpLabel
-OpUnreachable
 OpFunctionEnd

tests/ui/dis/ptr_read.stderr

@@ -5,7 +5,7 @@
 OpLine %8 1096 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
-OpStore %6 %9
+OpStore %6 %12
 OpLine %11 8 1
 OpReturn
 OpFunctionEnd

tests/ui/dis/ptr_read_method.stderr

@@ -5,7 +5,7 @@
 OpLine %8 1096 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
-OpStore %6 %9
+OpStore %6 %12
 OpLine %11 8 1
 OpReturn
 OpFunctionEnd

tests/ui/lang/consts/nested-ref.stderr

@@ -1,6 +1,6 @@
-warning: function `nested_ref::deep_load` has `dont_inline` attribute, but need to be inlined because it has illegal argument or return types
+warning: Function `nested_ref::deep_load` has `dont_inline` attribute, but need to be inlined because it has illegal argument or return types
 
-warning: function `nested_ref::deep_transpose` has `dont_inline` attribute, but need to be inlined because it has illegal argument or return types
+warning: Function `nested_ref::deep_transpose` has `dont_inline` attribute, but need to be inlined because it has illegal argument or return types
 
 warning: 2 warnings emitted