WIP Introduce ConstValue::ScalarPair #115915
Closed
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
|
r? @jackh726 (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
rustbot
added
the
S-waiting-on-perf
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 17, 2023
WIP Replace ConstValue::Slice by ConstValue::ScalarPair Both the interpreter and codegen have dedicated paths for scalar pairs. Having one in ConstValue makes is able to represent all "immediate" values. In order to mitigate the increase in the size of the ConstValue struct, a first commit interns it.
cjgillot
force-pushed
the
const-pair
branch
from
b07c1b4
to
e91604e
Compare
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 17, 2023
WIP Replace ConstValue::Slice by ConstValue::ScalarPair Both the interpreter and codegen have dedicated paths for scalar pairs. Having one in ConstValue makes is able to represent all "immediate" values. In order to mitigate the increase in the size of the ConstValue struct, a first commit interns it.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-author
cjgillot
force-pushed
the
const-pair
branch
from
e91604e
to
a8c8dea
Compare
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 17, 2023
WIP Replace ConstValue::Slice by ConstValue::ScalarPair Both the interpreter and codegen have dedicated paths for scalar pairs. Having one in ConstValue makes is able to represent all "immediate" values. In order to mitigate the increase in the size of the ConstValue struct, a first commit interns it.
This comment has been minimized.
This comment has been minimized.
|
☀️ Try build successful - checks-actions |
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (f827ada): comparison URL. Overall result: ❌✅ regressions and improvements - ACTION NEEDEDBenchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf. Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @bors rollup=never Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Binary sizeResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Bootstrap: 636.351s -> 636.345s (-0.00%) |
rustbot
added
perf-regression
cjgillot
changed the title
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
rustbot
added
the
S-waiting-on-perf
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 17, 2023
WIP Introduce ConstValue::ScalarPair Both the interpreter and codegen have dedicated paths for scalar pairs. Having one in ConstValue makes is able to represent all "immediate" values. In order to mitigate the increase in the size of the ConstValue struct, a first commit interns it.
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
☀️ Try build successful - checks-actions |
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (1b3ed3e): comparison URL. Overall result: ❌✅ regressions and improvements - ACTION NEEDEDBenchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf. Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @bors rollup=never Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Binary sizeResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
Bootstrap: 634.064s -> 635.805s (0.27%) |
rustbot
removed
the
S-waiting-on-perf
|
We had I have laid down my vision for how |
RalfJung
reviewed
Sep 18, 2023
| /// Represents a constant value in Rust. `Scalar` and `Slice` are optimizations for | ||
| /// array length computations, enum discriminants and the pattern matching logic. | ||
| #[derive(Copy, Clone, Debug, Eq, PartialEq, TyEncodable, TyDecodable, Hash)] | ||
| #[derive(HashStable, Lift)] | ||
| pub enum ConstValue<'tcx> { | ||
| pub enum ConstValueKind<'tcx> { | ||
| /// Used for types with `layout::abi::Scalar` ABI. | ||
| /// | ||
| /// Not using the enum `Value` to encode that this must not be `Uninit`. |
There was a problem hiding this comment.
I do wonder which enum this refers to... I think it's just a very outdated comment.^^
RalfJung
reviewed
Sep 18, 2023
| @@ -50,7 +57,7 @@ pub enum ConstValue<'tcx> { | |||
|
|
|||
| /// A value not representable by the other variants; needs to be stored in-memory. | |||
| /// | |||
| /// Must *not* be used for scalars or ZST, but having `&str` or other slices in this variant is fine. | |||
| /// Must *not* be used for scalars, scalar pairs or ZST. | |||
There was a problem hiding this comment.
Your const_to_op violates this rule for scalar pairs. Either the comment or const_to_op need to be updated.
RalfJung
reviewed
Sep 18, 2023
| @@ -65,35 +72,48 @@ pub enum ConstValue<'tcx> { | |||
| } | |||
|
|
|||
| #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))] | |||
| static_assert_size!(ConstValue<'_>, 32); | |||
| static_assert_size!(ConstValue<'_>, 8); | |||
There was a problem hiding this comment.
That doesn't seem like a useful assertion, it's an interned pointer now...
RalfJung
reviewed
Sep 18, 2023
| /// Used for types with `layout::abi::ScalarPair` ABI. | ||
| /// | ||
| /// Not using the enum `Value` to encode that this must not be `Uninit`. | ||
| ScalarPair(Scalar, Scalar), |
There was a problem hiding this comment.
We definitely don't want to have ScalarPair and Slice. Why would that make sense?
|
Closing this as it is WIP and heavily bitrotted |
Dylan-DPC
added
S-inactive
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.
Both the interpreter and codegen have dedicated paths for scalar pairs. Having one in ConstValue makes is able to represent all "immediate" values.
In order to mitigate the increase in the size of the ConstValue struct, a first commit interns it.