Auto merge of #150192 - dianqk:gvn-range-if-assert, r=<try>

[EXPERIMENT] GVN: Track known value ranges through assert and switchInt.

Author: rust-bors[bot]

compiler/rustc_mir_transform/src/gvn.rs

@@ -90,14 +90,16 @@ use std::hash::{Hash, Hasher};
 use either::Either;
 use hashbrown::hash_table::{Entry, HashTable};
 use itertools::Itertools as _;
-use rustc_abi::{self as abi, BackendRepr, FIRST_VARIANT, FieldIdx, Primitive, Size, VariantIdx};
+use rustc_abi::{
+    self as abi, BackendRepr, FIRST_VARIANT, FieldIdx, Primitive, Size, VariantIdx, WrappingRange,
+};
 use rustc_arena::DroplessArena;
 use rustc_const_eval::const_eval::DummyMachine;
 use rustc_const_eval::interpret::{
     ImmTy, Immediate, InterpCx, MemPlaceMeta, MemoryKind, OpTy, Projectable, Scalar,
     intern_const_alloc_for_constprop,
 };
-use rustc_data_structures::fx::FxHasher;
+use rustc_data_structures::fx::{FxHashMap, FxHasher};
 use rustc_data_structures::graph::dominators::Dominators;
 use rustc_hir::def::DefKind;
 use rustc_index::bit_set::DenseBitSet;
@@ -130,10 +132,25 @@ impl<'tcx> crate::MirPass<'tcx> for GVN {
         // Clone dominators because we need them while mutating the body.
         let dominators = body.basic_blocks.dominators().clone();
         let maybe_loop_headers = loops::maybe_loop_headers(body);
+        let predecessors = body.basic_blocks.predecessors();
+        let mut unique_predecessors = DenseBitSet::new_empty(body.basic_blocks.len());
+        for (bb, _) in body.basic_blocks.iter_enumerated() {
+            if predecessors[bb].len() == 1 {
+                unique_predecessors.insert(bb);
+            }
+        }
 
         let arena = DroplessArena::default();
-        let mut state =
-            VnState::new(tcx, body, typing_env, &ssa, dominators, &body.local_decls, &arena);
+        let mut state = VnState::new(
+            tcx,
+            body,
+            typing_env,
+            &ssa,
+            dominators,
+            &body.local_decls,
+            &arena,
+            unique_predecessors,
+        );
 
         for local in body.args_iter().filter(|&local| ssa.is_ssa(local)) {
             let opaque = state.new_opaque(body.local_decls[local].ty);
@@ -380,6 +397,10 @@ struct VnState<'body, 'a, 'tcx> {
     dominators: Dominators<BasicBlock>,
     reused_locals: DenseBitSet<Local>,
     arena: &'a DroplessArena,
+    /// Known ranges at each locations.
+    ranges: IndexVec<VnIndex, Vec<(Location, WrappingRange)>>,
+    /// Determines if the basic block has a single unique predecessor.
+    unique_predecessors: DenseBitSet<BasicBlock>,
 }
 
 impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
@@ -391,6 +412,7 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
         dominators: Dominators<BasicBlock>,
         local_decls: &'body LocalDecls<'tcx>,
         arena: &'a DroplessArena,
+        unique_predecessors: DenseBitSet<BasicBlock>,
     ) -> Self {
         // Compute a rough estimate of the number of values in the body from the number of
         // statements. This is meant to reduce the number of allocations, but it's all right if
@@ -413,6 +435,8 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
             dominators,
             reused_locals: DenseBitSet::new_empty(local_decls.len()),
             arena,
+            ranges: IndexVec::with_capacity(num_values),
+            unique_predecessors,
         }
     }
 
@@ -429,6 +453,8 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
             debug_assert_eq!(index, _index);
             let _index = self.rev_locals.push(SmallVec::new());
             debug_assert_eq!(index, _index);
+            let _index = self.ranges.push(Vec::new());
+            debug_assert_eq!(index, _index);
         }
         index
     }
@@ -442,6 +468,8 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
         debug_assert_eq!(index, _index);
         let _index = self.rev_locals.push(SmallVec::new());
         debug_assert_eq!(index, _index);
+        let _index = self.ranges.push(Vec::new());
+        debug_assert_eq!(index, _index);
         index
     }
 
@@ -480,6 +508,8 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
         debug_assert_eq!(index, _index);
         let _index = self.rev_locals.push(SmallVec::new());
         debug_assert_eq!(index, _index);
+        let _index = self.ranges.push(Vec::new());
+        debug_assert_eq!(index, _index);
 
         Some(index)
     }
@@ -504,6 +534,8 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
             debug_assert_eq!(index, _index);
             let _index = self.rev_locals.push(SmallVec::new());
             debug_assert_eq!(index, _index);
+            let _index = self.ranges.push(Vec::new());
+            debug_assert_eq!(index, _index);
         }
         index
     }
@@ -526,6 +558,20 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
         self.rev_locals[value].push(local);
     }
 
+    /// Create a new known range at the location.
+    fn insert_range(&mut self, value: VnIndex, location: Location, range: WrappingRange) {
+        self.ranges[value].push((location, range));
+    }
+
+    /// Get the known range at the location.
+    fn get_range(&self, value: VnIndex, location: Location) -> Option<WrappingRange> {
+        // FIXME: This should use the intersection of all valid ranges.
+        let (_, range) = self.ranges[value]
+            .iter()
+            .find(|(range_loc, _)| range_loc.dominates(location, &self.dominators))?;
+        Some(*range)
+    }
+
     fn insert_bool(&mut self, flag: bool) -> VnIndex {
         // Booleans are deterministic.
         let value = Const::from_bool(self.tcx, flag);
@@ -1010,7 +1056,7 @@ impl<'body, 'a, 'tcx> VnState<'body, 'a, 'tcx> {
             Operand::Constant(ref constant) => Some(self.insert_constant(constant.const_)),
             Operand::Copy(ref mut place) | Operand::Move(ref mut place) => {
                 let value = self.simplify_place_value(place, location)?;
-                if let Some(const_) = self.try_as_constant(value) {
+                if let Some(const_) = self.try_as_constant(value, location) {
                     *operand = Operand::Constant(Box::new(const_));
                 }
                 Some(value)
@@ -1780,7 +1826,7 @@ impl<'tcx> VnState<'_, '_, 'tcx> {
     /// If either [`Self::try_as_constant`] as [`Self::try_as_place`] succeeds,
     /// returns that result as an [`Operand`].
     fn try_as_operand(&mut self, index: VnIndex, location: Location) -> Option<Operand<'tcx>> {
-        if let Some(const_) = self.try_as_constant(index) {
+        if let Some(const_) = self.try_as_constant(index, location) {
             Some(Operand::Constant(Box::new(const_)))
         } else if let Some(place) = self.try_as_place(index, location, false) {
             self.reused_locals.insert(place.local);
@@ -1791,7 +1837,11 @@ impl<'tcx> VnState<'_, '_, 'tcx> {
     }
 
     /// If `index` is a `Value::Constant`, return the `Constant` to be put in the MIR.
-    fn try_as_constant(&mut self, index: VnIndex) -> Option<ConstOperand<'tcx>> {
+    fn try_as_constant(
+        &mut self,
+        index: VnIndex,
+        location: Location,
+    ) -> Option<ConstOperand<'tcx>> {
         // This was already constant in MIR, do not change it. If the constant is not
         // deterministic, adding an additional mention of it in MIR will not give the same value as
         // the former mention.
@@ -1800,21 +1850,34 @@ impl<'tcx> VnState<'_, '_, 'tcx> {
             return Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_: value });
         }
 
-        let op = self.eval_to_const(index)?;
-        if op.layout.is_unsized() {
-            // Do not attempt to propagate unsized locals.
-            return None;
-        }
+        if let Some(op) = self.eval_to_const(index) {
+            if op.layout.is_unsized() {
+                // Do not attempt to propagate unsized locals.
+                return None;
+            }
+
+            let value = op_to_prop_const(&mut self.ecx, op)?;
 
-        let value = op_to_prop_const(&mut self.ecx, op)?;
+            // Check that we do not leak a pointer.
+            // Those pointers may lose part of their identity in codegen.
+            // FIXME: remove this hack once https://github.com/rust-lang/rust/issues/79738 is fixed.
+            assert!(!value.may_have_provenance(self.tcx, op.layout.size));
 
-        // Check that we do not leak a pointer.
-        // Those pointers may lose part of their identity in codegen.
-        // FIXME: remove this hack once https://github.com/rust-lang/rust/issues/79738 is fixed.
-        assert!(!value.may_have_provenance(self.tcx, op.layout.size));
+            let const_ = Const::Val(value, op.layout.ty);
+            return Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_ });
+        }
 
-        let const_ = Const::Val(value, op.layout.ty);
-        Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_ })
+        if let Some(range) = self.get_range(index, location)
+            && range.start == range.end
+        {
+            let ty = self.ty(index);
+            let layout = self.ecx.layout_of(ty).ok()?;
+            let value = ConstValue::Scalar(Scalar::from_uint(range.start, layout.size));
+            let const_ = Const::Val(value, self.ty(index));
+            return Some(ConstOperand { span: DUMMY_SP, user_ty: None, const_ });
+        }
+
+        None
     }
 
     /// Construct a place which holds the same value as `index` and for which all locals strictly
@@ -1891,7 +1954,7 @@ impl<'tcx> MutVisitor<'tcx> for VnState<'_, '_, 'tcx> {
 
         let value = self.simplify_rvalue(lhs, rvalue, location);
         if let Some(value) = value {
-            if let Some(const_) = self.try_as_constant(value) {
+            if let Some(const_) = self.try_as_constant(value, location) {
                 *rvalue = Rvalue::Use(Operand::Constant(Box::new(const_)));
             } else if let Some(place) = self.try_as_place(value, location, false)
                 && *rvalue != Rvalue::Use(Operand::Move(place))
@@ -1920,14 +1983,68 @@ impl<'tcx> MutVisitor<'tcx> for VnState<'_, '_, 'tcx> {
     }
 
     fn visit_terminator(&mut self, terminator: &mut Terminator<'tcx>, location: Location) {
-        if let Terminator { kind: TerminatorKind::Call { destination, .. }, .. } = terminator {
-            if let Some(local) = destination.as_local()
-                && self.ssa.is_ssa(local)
-            {
-                let ty = self.local_decls[local].ty;
-                let opaque = self.new_opaque(ty);
-                self.assign(local, opaque);
+        match &mut terminator.kind {
+            TerminatorKind::Call { destination, .. } => {
+                if let Some(local) = destination.as_local()
+                    && self.ssa.is_ssa(local)
+                {
+                    let ty = self.local_decls[local].ty;
+                    let opaque = self.new_opaque(ty);
+                    self.assign(local, opaque);
+                }
+            }
+            TerminatorKind::Assert { cond, expected, target, .. } => {
+                if let Some(value) = self.simplify_operand(cond, location) {
+                    let successor = Location { block: *target, statement_index: 0 };
+                    if location.block != successor.block
+                        && self.unique_predecessors.contains(successor.block)
+                    {
+                        let val = *expected as u128;
+                        let range = WrappingRange { start: val, end: val };
+                        self.insert_range(value, successor, range);
+                    }
+                }
+            }
+            TerminatorKind::SwitchInt { discr, targets } => {
+                if let Some(value) = self.simplify_operand(discr, location) {
+                    let mut distinct_targets: FxHashMap<BasicBlock, u8> = FxHashMap::default();
+                    for (_, target) in targets.iter() {
+                        let targets = distinct_targets.entry(target).or_default();
+                        if *targets == 0 {
+                            *targets = 1;
+                        } else {
+                            *targets = 2;
+                        }
+                    }
+                    for (val, target) in targets.iter() {
+                        if distinct_targets[&target] != 1 {
+                            continue;
+                        }
+                        let successor = Location { block: target, statement_index: 0 };
+                        if location.block != successor.block
+                            && self.unique_predecessors.contains(successor.block)
+                        {
+                            let range = WrappingRange { start: val, end: val };
+                            self.insert_range(value, successor, range);
+                        }
+                    }
+
+                    let otherwise = Location { block: targets.otherwise(), statement_index: 0 };
+                    if self.ty(value).is_bool()
+                        && let [val] = targets.all_values()
+                        && location.block != otherwise.block
+                        && self.unique_predecessors.contains(otherwise.block)
+                    {
+                        let range = if val.get() == 0 {
+                            WrappingRange { start: 1, end: 1 }
+                        } else {
+                            WrappingRange { start: 0, end: 0 }
+                        };
+                        self.insert_range(value, otherwise, range);
+                    }
+                }
             }
+            _ => {}
         }
         // Terminators that can write to memory may invalidate (nested) derefs.
         if terminator.kind.can_write_to_memory() {

tests/mir-opt/early_otherwise_branch_unwind.poll.EarlyOtherwiseBranch.diff

@@ -39,7 +39,7 @@
 
       bb3: {
           _2 = discriminant(((((_1 as Ready).0: std::result::Result<std::option::Option<std::vec::Vec<u8>>, u8>) as Ok).0: std::option::Option<std::vec::Vec<u8>>));
-          switchInt(copy _2) -> [0: bb5, 1: bb7, otherwise: bb1];
+          switchInt(move _2) -> [0: bb5, 1: bb7, otherwise: bb1];
       }
 
       bb4: {
@@ -112,15 +112,15 @@
       }
 
       bb18 (cleanup): {
-          switchInt(copy _3) -> [0: bb19, otherwise: bb9];
+          switchInt(const 0_isize) -> [0: bb19, otherwise: bb9];
       }
 
       bb19 (cleanup): {
           goto -> bb9;
       }
 
       bb20 (cleanup): {
-          switchInt(copy _4) -> [0: bb18, otherwise: bb9];
+          switchInt(const 0_isize) -> [0: bb18, otherwise: bb9];
       }
   }
 

tests/mir-opt/early_otherwise_branch_unwind.unwind.EarlyOtherwiseBranch.diff

@@ -35,7 +35,7 @@
 
       bb3: {
           _2 = discriminant(((((_1 as Some).0: std::option::Option<std::option::Option<T>>) as Some).0: std::option::Option<T>));
-          switchInt(copy _2) -> [0: bb6, 1: bb7, otherwise: bb1];
+          switchInt(move _2) -> [0: bb6, 1: bb7, otherwise: bb1];
       }
 
       bb4: {
@@ -105,15 +105,15 @@
       }
 
       bb18 (cleanup): {
-          switchInt(copy _3) -> [1: bb19, otherwise: bb9];
+          switchInt(const 1_isize) -> [1: bb19, otherwise: bb9];
       }
 
       bb19 (cleanup): {
           goto -> bb9;
       }
 
       bb20 (cleanup): {
-          switchInt(copy _4) -> [1: bb18, otherwise: bb9];
+          switchInt(const 1_isize) -> [1: bb18, otherwise: bb9];
       }
   }
 

tests/mir-opt/gvn.arithmetic.GVN.panic-abort.diff

@@ -222,8 +222,8 @@
           _32 = copy _1;
 -         _33 = Eq(copy _32, const 0_u64);
 -         assert(!move _33, "attempt to divide `{}` by zero", const 1_u64) -> [success: bb12, unwind unreachable];
-+         _33 = copy _29;
-+         assert(!copy _29, "attempt to divide `{}` by zero", const 1_u64) -> [success: bb12, unwind unreachable];
++         _33 = const false;
++         assert(!const false, "attempt to divide `{}` by zero", const 1_u64) -> [success: bb12, unwind unreachable];
       }
 
       bb12: {
@@ -283,8 +283,8 @@
           _44 = copy _1;
 -         _45 = Eq(copy _44, const 0_u64);
 -         assert(!move _45, "attempt to calculate the remainder of `{}` with a divisor of zero", const 0_u64) -> [success: bb18, unwind unreachable];
-+         _45 = copy _29;
-+         assert(!copy _29, "attempt to calculate the remainder of `{}` with a divisor of zero", const 0_u64) -> [success: bb18, unwind unreachable];
++         _45 = const false;
++         assert(!const false, "attempt to calculate the remainder of `{}` with a divisor of zero", const 0_u64) -> [success: bb18, unwind unreachable];
       }
 
       bb18: {
@@ -304,8 +304,8 @@
           _48 = copy _1;
 -         _49 = Eq(copy _48, const 0_u64);
 -         assert(!move _49, "attempt to calculate the remainder of `{}` with a divisor of zero", const 1_u64) -> [success: bb20, unwind unreachable];
-+         _49 = copy _29;
-+         assert(!copy _29, "attempt to calculate the remainder of `{}` with a divisor of zero", const 1_u64) -> [success: bb20, unwind unreachable];
++         _49 = const false;
++         assert(!const false, "attempt to calculate the remainder of `{}` with a divisor of zero", const 1_u64) -> [success: bb20, unwind unreachable];
       }
 
       bb20: {