In smir use FxIndexMap to store indexed ids

[ouz-a]

Previously we used vec for storing indexed types, which is fine for small cases but will lead to huge performance issues when we use smir for real world cases.

Addresses rust-lang/project-stable-mir#35

r? @oli-obk

[rustbot]

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

[compiler-errors]

This PR needs a more descriptive name 😅 -- it should at least mention SMIR, but also why is it more efficient?

[ouz-a]

This PR needs a more descriptive name 😅 -- it should at least mention SMIR, but also why is it more efficient?

lol I thought I changed the name

[rustbot]

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

[rust-log-analyzer]

The job x86_64-gnu-llvm-15 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

GITHUB_ACTION=__run_7
GITHUB_ACTIONS=true
GITHUB_ACTION_REF=
GITHUB_ACTION_REPOSITORY=
GITHUB_ACTOR=ouz-a
GITHUB_API_URL=https://api.github.com
GITHUB_BASE_REF=master
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_44a2b040-40ae-433e-bc9c-6b3e39d52af1
GITHUB_EVENT_NAME=pull_request
---
GITHUB_SERVER_URL=https://github.com
GITHUB_SHA=8e736d20b43a1c16483479c86f05de76126c239d
GITHUB_STATE=/home/runner/work/_temp/_runner_file_commands/save_state_44a2b040-40ae-433e-bc9c-6b3e39d52af1
GITHUB_STEP_SUMMARY=/home/runner/work/_temp/_runner_file_commands/step_summary_44a2b040-40ae-433e-bc9c-6b3e39d52af1
GITHUB_TRIGGERING_ACTOR=ouz-a
GITHUB_WORKFLOW_REF=rust-lang/rust/.github/workflows/ci.yml@refs/pull/116560/merge
GITHUB_WORKFLOW_SHA=8e736d20b43a1c16483479c86f05de76126c239d
GITHUB_WORKSPACE=/home/runner/work/rust/rust
GOROOT_1_19_X64=/opt/hostedtoolcache/go/1.19.13/x64
---
..............i......................ii.............i..i.i.i..........i....i..i......... 176/523
........iiiii.ii.i..i....i..iiiii.......i.i.i....i.i......iiiii........ii........i.ii... 264/523
..i..i..i........................i...ii..ii.i....iiiiiiii...i.ii................ii...... 352/523
................i.........i........................ii.i.ii.iiiiii.i.................i... 440/523
.i....i...ii.........ii......i...F...............ii...iiii.iiiiiiii................
failures:

---- [codegen] tests/codegen/target-feature-inline-closure.rs stdout ----


error: verification with 'FileCheck' failed
status: exit status: 1
command: "/usr/lib/llvm-15/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll" "/checkout/tests/codegen/target-feature-inline-closure.rs" "--allow-unused-prefixes" "--check-prefixes" "CHECK,NONMSVC" "--dump-input-context" "100"
Build completed unsuccessfully in 0:12:49
--- stderr -------------------------------
/checkout/tests/codegen/target-feature-inline-closure.rs:27:16: error: CHECK-NOT: excluded string found in input
/checkout/tests/codegen/target-feature-inline-closure.rs:27:16: error: CHECK-NOT: excluded string found in input
 // CHECK-NOT: fadd
               ^
/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll:35:66: note: found here
 call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17ha5faddbf0c47d313E(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0)

Input file: /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/target-feature-inline-closure/target-feature-inline-closure.ll
Check file: /checkout/tests/codegen/target-feature-inline-closure.rs


-dump-input=help explains the following input dump.
Input was:
<<<<<<
<<<<<<
        1: ; ModuleID = 'target_feature_inline_closure.5b935a73a363356c-cgu.0' 
        2: source_filename = "target_feature_inline_closure.5b935a73a363356c-cgu.0" 
        3: target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" 
        4: target triple = "x86_64-unknown-linux-gnu" 
        5:  
        6: ; core::core_arch::x86::avx::_mm256_add_ps 
        7: ; Function Attrs: argmemonly inlinehint mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable 
        8: define internal fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17ha5faddbf0c47d313E(ptr noalias nocapture noundef writeonly align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %a, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %b) unnamed_addr #0 { 
        9: start: 
       10:  %0 = load <8 x float>, ptr %a, align 32 
       11:  %1 = load <8 x float>, ptr %b, align 32 
       12:  %2 = fadd <8 x float> %0, %1 
       13:  store <8 x float> %2, ptr %_0, align 32 
       14:  ret void 
       15: } 
       16:  
       17: ; Function Attrs: argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable 
       18: define void @with_avx(ptr noalias nocapture noundef writeonly sret(<8 x float>) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #1 { 
       19: start: 
       20:  %0 = load <8 x float>, ptr %x, align 32 
       21:  %1 = fadd <8 x float> %0, %0 
       22:  store <8 x float> %1, ptr %_0, align 32 
       23:  ret void 
       24: } 
       25:  
       26: ; Function Attrs: argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable 
       27: define void @without_avx(ptr noalias nocapture noundef writeonly sret(<8 x float>) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #2 { 
       28: start: 
       29:  %0 = alloca <8 x float>, align 32 
       30:  %1 = alloca <8 x float>, align 32 
       31:  %2 = load <8 x float>, ptr %x, align 32 
       32:  store <8 x float> %2, ptr %1, align 32 
       33:  store <8 x float> %2, ptr %0, align 32 
       34: ; call core::core_arch::x86::avx::_mm256_add_ps 
       35:  call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17ha5faddbf0c47d313E(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0) 
not:27                                                                      !~~~                                                                                                                                                                                                                                   error: no match expected
       36:  ret void 
       37: } 
       38:  
       39: attributes #0 = { argmemonly inlinehint mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" "target-features"="+avx" } 
       40: attributes #1 = { argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" "target-features"="+avx" } 
       41: attributes #2 = { argmemonly mustprogress nofree norecurse nosync nounwind nonlazybind willreturn uwtable "probe-stack"="__rust_probestack" "target-cpu"="x86-64" } 
       42:  
       43: !llvm.module.flags = !{!0, !1} 
       44: !llvm.ident = !{!2} 
       45:  
       46: !0 = !{i32 7, !"PIC Level", i32 2} 
       47: !1 = !{i32 2, !"RtLibUseGOT", i32 1} 
       48: !2 = !{!"rustc version 1.75.0-nightly (8e736d20b 2023-10-10)"} 
------------------------------------------

[ouz-a]

how does this affect code-gen test ?

[oli-obk]

It can't... I'll assume this is a bug that all PRs are hitting

[ouz-a]

🤔 It looks like my pr is the only one that is affected.

[oli-obk]

can you reproduce locally?

[ouz-a]

no I can't

[oli-obk]

@bors r+ rollup

probably spurious then

[bors]

📌 Commit 0bcb058 has been approved by oli-obk

It is now in the queue for this repository.