Deploying to gh-pages from @ fcd1b1e 🚀

Author: github-merge-queue[bot]

api/src/rustc_codegen_spirv/codegen_cx/mod.rs.html

@@ -961,7 +961,21 @@
 <a href="#960" id="960">960</a>
 <a href="#961" id="961">961</a>
 <a href="#962" id="962">962</a>
-<a href="#963" id="963">963</a></pre></div><pre class="rust"><code><span class="kw">mod </span>constant;
+<a href="#963" id="963">963</a>
+<a href="#964" id="964">964</a>
+<a href="#965" id="965">965</a>
+<a href="#966" id="966">966</a>
+<a href="#967" id="967">967</a>
+<a href="#968" id="968">968</a>
+<a href="#969" id="969">969</a>
+<a href="#970" id="970">970</a>
+<a href="#971" id="971">971</a>
+<a href="#972" id="972">972</a>
+<a href="#973" id="973">973</a>
+<a href="#974" id="974">974</a>
+<a href="#975" id="975">975</a>
+<a href="#976" id="976">976</a>
+<a href="#977" id="977">977</a></pre></div><pre class="rust"><code><span class="kw">mod </span>constant;
 <span class="kw">mod </span>declare;
 <span class="kw">mod </span>entry;
 <span class="kw">mod </span>type_;
@@ -1405,6 +1419,18 @@
                 <span class="string">"dump the merged module immediately after merging, to a file in DIR"</span>,
                 <span class="string">"DIR"</span>,
             );
+            opts.optopt(
+                <span class="string">""</span>,
+                <span class="string">"dump-pre-inline"</span>,
+                <span class="string">"dump the module immediately before inlining, to a file in DIR"</span>,
+                <span class="string">"DIR"</span>,
+            );
+            opts.optopt(
+                <span class="string">""</span>,
+                <span class="string">"dump-post-inline"</span>,
+                <span class="string">"dump the module immediately after inlining, to a file in DIR"</span>,
+                <span class="string">"DIR"</span>,
+            );
             opts.optopt(
                 <span class="string">""</span>,
                 <span class="string">"dump-post-split"</span>,
@@ -1583,6 +1609,8 @@
             <span class="comment">// NOTE(eddyb) these are debugging options that used to be env vars
             // (for more information see `docs/src/codegen-args.md`).
             </span>dump_post_merge: matches_opt_dump_dir_path(<span class="string">"dump-post-merge"</span>),
+            dump_pre_inline: matches_opt_dump_dir_path(<span class="string">"dump-pre-inline"</span>),
+            dump_post_inline: matches_opt_dump_dir_path(<span class="string">"dump-post-inline"</span>),
             dump_post_split: matches_opt_dump_dir_path(<span class="string">"dump-post-split"</span>),
             dump_spirt_passes: matches_opt_dump_dir_path(<span class="string">"dump-spirt-passes"</span>),
             spirt_strip_custom_debuginfo_from_dumps: matches

api/src/rustc_codegen_spirv/linker/dce.rs.html

@@ -285,7 +285,8 @@
 <a href="#284" id="284">284</a>
 <a href="#285" id="285">285</a>
 <a href="#286" id="286">286</a>
-<a href="#287" id="287">287</a></pre></div><pre class="rust"><code><span class="doccomment">//! Dead code elimination
+<a href="#287" id="287">287</a>
+<a href="#288" id="288">288</a></pre></div><pre class="rust"><code><span class="doccomment">//! Dead code elimination
 //!
 //! This pass removes any instruction that doesn't affect the module. It does so by considering all
 //! `OpEntryPoint` instructions to be "rooted", and then everything a rooted instruction touches is
@@ -294,9 +295,10 @@
 //! *references* a rooted thing is also rooted, not the other way around - but that's the basic
 //! concept.
 
-</span><span class="kw">use </span>rspirv::dr::{Function, Instruction, Module, Operand};
+</span><span class="kw">use </span>rspirv::dr::{Block, Function, Instruction, Module, Operand};
 <span class="kw">use </span>rspirv::spirv::{Decoration, LinkageType, Op, StorageClass, Word};
-<span class="kw">use </span>rustc_data_structures::fx::FxIndexSet;
+<span class="kw">use </span>rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
+<span class="kw">use </span>std::hash::Hash;
 
 <span class="kw">pub fn </span>dce(module: <span class="kw-2">&amp;mut </span>Module) {
     <span class="kw">let </span><span class="kw-2">mut </span>rooted = collect_roots(module);
@@ -424,11 +426,11 @@
     }
 }
 
-<span class="kw">pub fn </span>dce_phi(func: <span class="kw-2">&amp;mut </span>Function) {
+<span class="kw">pub fn </span>dce_phi(blocks: <span class="kw-2">&amp;mut </span>FxIndexMap&lt;<span class="kw">impl </span>Eq + Hash, <span class="kw-2">&amp;mut </span>Block&gt;) {
     <span class="kw">let </span><span class="kw-2">mut </span>used = FxIndexSet::default();
     <span class="kw">loop </span>{
         <span class="kw">let </span><span class="kw-2">mut </span>changed = <span class="bool-val">false</span>;
-        <span class="kw">for </span>inst <span class="kw">in </span>func.all_inst_iter() {
+        <span class="kw">for </span>inst <span class="kw">in </span>blocks.values().flat_map(|block| <span class="kw-2">&amp;</span>block.instructions) {
             <span class="kw">if </span>inst.class.opcode != Op::Phi || used.contains(<span class="kw-2">&amp;</span>inst.result_id.unwrap()) {
                 <span class="kw">for </span>op <span class="kw">in </span><span class="kw-2">&amp;</span>inst.operands {
                     <span class="kw">if let </span><span class="prelude-val">Some</span>(id) = op.id_ref_any() {
@@ -441,7 +443,7 @@
             <span class="kw">break</span>;
         }
     }
-    <span class="kw">for </span>block <span class="kw">in </span><span class="kw-2">&amp;mut </span>func.blocks {
+    <span class="kw">for </span>block <span class="kw">in </span>blocks.values_mut() {
         block
             .instructions
             .retain(|inst| inst.class.opcode != Op::Phi || used.contains(<span class="kw-2">&amp;</span>inst.result_id.unwrap()));