Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: do not inhibit caching of default-level match reduction #2612

Merged
merged 1 commit into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/Lean/Meta/WHNF.lean
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,13 @@ private def whnfMatcher (e : Expr) : MetaM Expr := do
For example, `simp [Int.div]` will not unfold the application `Int.div 2 1` occuring in the target.

TODO: consider other solutions; investigate whether the solution above produces counterintuitive behavior. -/
let mut transparency ← getTransparency
if transparency == TransparencyMode.reducible then
transparency := TransparencyMode.instances
withTransparency transparency <| withReader (fun ctx => { ctx with canUnfold? := canUnfoldAtMatcher }) do
if (← getTransparency) matches .instances | .reducible then
-- Also unfold some default-reducible constants; see `canUnfoldAtMatcher`
withTransparency .instances <| withReader (fun ctx => { ctx with canUnfold? := canUnfoldAtMatcher }) do
whnf e
else
-- Do NOT use `canUnfoldAtMatcher` here as it does not affect all/default reducibility and inhibits caching (#2564).
-- In the future, we want to work on better reduction strategies that do not require caching.
whnf e

def reduceMatcher? (e : Expr) : MetaM ReduceMatcherResult := do
Expand Down
40 changes: 40 additions & 0 deletions tests/bench/reduceMatch.lean
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import Lean

/-!
#2564. `match` reduction currently has some special cases.
When combined with nonlinear functions like `List.insert` below,
it is crucial to preserve sharing during reduction. -/

section decidability_instances

variable {α : Type} {p : α → Prop} [DecidablePred p]

instance decidableBex : ∀ (l : List α), Decidable (∃ x, x ∈ l → p x)
| [] => isFalse sorry
| x::xs =>
match ‹DecidablePred p› x with
| isTrue h₁ => isTrue sorry
| isFalse h₁ => match decidableBex xs with
| isTrue h₂ => isTrue sorry
| isFalse h₂ => isFalse sorry

instance decidableBall (l : List α) : Decidable (∀ x, x ∈ l → p x) :=
match (inferInstance : Decidable <| ∃ x, x ∈ l → ¬ p x) with
| isFalse h => isTrue $ fun x hx => match ‹DecidablePred p› x with
| isTrue h' => h'
| isFalse h' => False.elim $ h sorry
| isTrue h => isFalse sorry

end decidability_instances

@[inline] protected def List.insert {α : Type} [DecidableEq α] (a : α) (l : List α) : List α :=
if a ∈ l then l else a :: l

def parts : List (List Nat) := List.insert ([1, 1, 0, 0]) <| List.insert ([0, 0, 1, 1]) <|
List.insert ([1, 0, 0, 1]) <| List.insert ([1, 1, 1, 0]) <| List.insert ([1, 0, 0, 0]) <|
List.insert [1, 2, 3, 4] <| List.insert [5, 6, 7, 8] []

#eval show Lean.Elab.Command.CommandElabM _ from
for _ in [0:10] do
Lean.Elab.Command.elabCommand (←
`(example : ∀ (x) (_ : x ∈ parts) (y) (_ : y ∈ parts), x ++ y ∉ parts := by decide))
6 changes: 6 additions & 0 deletions tests/bench/speedcenter.exec.velcom.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,12 @@
cmd: ./rbmap_library.lean.out 2000000
build_config:
cmd: ./compile.sh rbmap_library.lean
- attributes:
description: reduceMatch
tags: [fast, suite]
run_config:
<<: *time
cmd: lean reduceMatch.lean
- attributes:
description: unionfind
tags: [fast, suite]
Expand Down