refactor: getUnfoldableConst*?
#5997
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Kha
commented
Nov 7, 2024
| @@ -1263,10 +1263,7 @@ private def processAssignment' (mvarApp : Expr) (v : Expr) : MetaM Bool := do | |||
|
|
|||
| private def isDeltaCandidate? (t : Expr) : MetaM (Option ConstantInfo) := do | |||
| match t.getAppFn with | |||
| | Expr.const c _ => | |||
| match (← getUnfoldableConst? c) with | |||
| | r@(some info) => if info.hasValue then return r else return none | |||
There was a problem hiding this comment.
hasValue checks unnecessary now that getUnfoldableConst*? is documented to return defs/thms.
Comment on lines
-66
to
-72
| @[inline] private def matchConstAux {α} (e : Expr) (failK : Unit → MetaM α) (k : ConstantInfo → List Level → MetaM α) : MetaM α := do | ||
| let .const name lvls := e | ||
| | failK () | ||
| let (some cinfo) ← getUnfoldableConst? name | ||
| | failK () | ||
| k cinfo lvls |
There was a problem hiding this comment.
I found the code clearer after inlining this helper, its name is too mysterious otherwise
| matchConstAux f.getAppFn (fun _ => unfoldProjInstWhenInstances? e) fun fInfo fLvls => do | ||
| | .app f _ => do | ||
| let .const fName fLvls := f.getAppFn | unfoldProjInstWhenInstances? e | ||
| match (← getUnfoldableConst? fName) with |
There was a problem hiding this comment.
This is the only former matchConstAux caller that cares about unfolding
Kha
force-pushed
the
push-xqpvqmqwlqxp
branch
from
27c91a5 to
a719d61
Compare
|
!bench |
|
Here are the benchmark results for commit a719d61. Benchmark Metric Change
=====================================================
+ big_do branch-misses -7.7% (-18.1 σ)
+ big_omega.lean MT branch-misses -4.5% (-22.1 σ)
- lake env task-clock 6.8% (12.2 σ)
- lake env wall-clock 6.8% (12.8 σ)
+ reduceMatch instructions -1.2% (-367.6 σ) |
github-actions
bot
added
the
toolchain-available
leanprover-community-mathlib4-bot
added a commit
to leanprover-community/batteries
that referenced
this pull request
Nov 7, 2024
leanprover-community-mathlib4-bot
added a commit
to leanprover-community/mathlib4
that referenced
this pull request
Nov 7, 2024
leanprover-community-bot
added
the
builds-mathlib
|
Mathlib CI status (docs):
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Continuation from #5429: eliminates uses of these two functions that care about something other than reducible defs/theorems, then restricts the function definition to these cases to be more true to its name.