-
Notifications
You must be signed in to change notification settings - Fork 220
FSE decoding improvements in ZSTD #2944
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
Conversation
|
Is this ready for review? |
|
@dplassgit yes it is. |
dplassgit
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approval with request for reformatting.
xls/modules/zstd/fse_dec.x
Outdated
| ) { | ||
| let (cmd_s, cmd_r) = chan<FseDecoderCommandReq, u32:1>("fse_dec_cmd_req"); | ||
|
|
||
| spawn FseDecoderCommand |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Funny formatting here, and other places int his file. You should be able to format with the command line tool.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reformatted the code as requested
|
Looks like zstd_dec_dslx_test is failing: |
92178c4 to
2cfc588
Compare
Co-autored-by: Dominik Lau <[email protected]> Signed-off-by: Robert Winkler <[email protected]>
…mmit desc Co-autored-by: Dominik Lau <[email protected]> Signed-off-by: Robert Winkler <[email protected]>
Internal-tag: #[82067]
Signed-off-by: Robert Winkler <[email protected]>
This change was introduced as a workaround for malfunctioning proc-scoped type aliases Signed-off-by: Robert Winkler <[email protected]>
2cfc588 to
c9582db
Compare
|
This is interesting. It looks like the proc-scoped type is treated in different way than a local type alias, because the error disappears after redefining the type in the next's body: diff --git a/xls/modules/zstd/zstd_dec.x b/xls/modules/zstd/zstd_dec.x
index a68ed6514..11af2a7fc 100644
--- a/xls/modules/zstd/zstd_dec.x
+++ b/xls/modules/zstd/zstd_dec.x
@@ -243,6 +243,7 @@ proc ZstdDecoderInternal<
next (state: State) {
let tok0 = join();
+ type CsrRdReq = csr_config::CsrRdReq<LOG2_REGS_N>;
const CSR_REQS = CsrRdReq[2]:[
CsrRdReq {csr: csr<LOG2_REGS_N>(Csr::INPUT_BUFFER)},
CsrRdReq {csr: csr<LOG2_REGS_N>(Csr::OUTPUT_BUFFER)}or after referencing the type without the proc-scoped alias: diff --git a/xls/modules/zstd/zstd_dec.x b/xls/modules/zstd/zstd_dec.x
index a68ed6514..d22927ad3 100644
--- a/xls/modules/zstd/zstd_dec.x
+++ b/xls/modules/zstd/zstd_dec.x
@@ -243,7 +243,7 @@ proc ZstdDecoderInternal<
next (state: State) {
let tok0 = join();
- const CSR_REQS = CsrRdReq[2]:[
+ const CSR_REQS = csr_config::CsrRdReq<LOG2_REGS_N>[2]:[
CsrRdReq {csr: csr<LOG2_REGS_N>(Csr::INPUT_BUFFER)},
CsrRdReq {csr: csr<LOG2_REGS_N>(Csr::OUTPUT_BUFFER)}
]; |
|
Superseded by #3034 |
|
@proppy @dplassgit since #3034 got merged this one can be closed. |
|
Closed since #3034 supersedes it and is merged. |
In this PR the following changes have been made: