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

litex: gen: fhdl: verilog.py: resolve slice in lower_complex_slices() #2165

Merged

Conversation

maass-hamburg
Copy link
Contributor

@maass-hamburg maass-hamburg commented Jan 20, 2025

bring back lower_complex_slices() as it is sometimes needed.
for example, when a Slice of a Cat() is done.

migen: m-labs/migen#301

@maass-hamburg maass-hamburg marked this pull request as draft January 20, 2025 10:12
@maass-hamburg maass-hamburg force-pushed the bring_back_lower_slice branch from a7beca3 to 1cddee8 Compare January 20, 2025 10:59
@enjoy-digital
Copy link
Owner

Thanks @maass-hamburg, can you verify that the following designs that were problematic with the previous changes are correctly building with the newer changes?:

python3 -m litex_boards.targets.lambdaconcept_ecpix5 --build --cpu-type rocket --cpu-variant linux --cpu-num-cores 1 --cpu-mem-width 2 --sys-clk-freq 50e6 --with-ethernet --with-sdcard --yosys-flow3

and

python3 -m litex_boards.targets.digilent_nexys_video.py --build --cpu-type rocket --cpu-variant linux --cpu-num-cores 4 --cpu-mem-width 2 --sys-clk-freq 50e6 --with-ethernet --with-sdcard --with-sata --sata-gen 1

@gsomlo
Copy link
Collaborator

gsomlo commented Jan 22, 2025 via email

resove slices in lower_complex_slices() completly,
to reduce complexity in the verilog files.

Signed-off-by: Fin Maaß <[email protected]>
@maass-hamburg maass-hamburg force-pushed the bring_back_lower_slice branch from 1cddee8 to e989564 Compare January 22, 2025 14:45
@maass-hamburg
Copy link
Contributor Author

I removed the change of _generate_slice, as I had already moved the slice resolving logic to the lowerer and don't have to do that twice.

@maass-hamburg maass-hamburg marked this pull request as ready for review January 22, 2025 14:46
@gsomlo
Copy link
Collaborator

gsomlo commented Jan 23, 2025 via email

If the Slice is inside the boarders of one Objekt of Cat or Replicate
resolve it too.

Signed-off-by: Fin Maaß <[email protected]>
@maass-hamburg maass-hamburg changed the title Bring back lower slice litex: gen: fhdl: verilog.py: resolve slice in lower_complex_slices() Jan 23, 2025
@enjoy-digital enjoy-digital merged commit d07c068 into enjoy-digital:master Jan 27, 2025
1 check passed
@enjoy-digital
Copy link
Owner

Thanks @maass-hamburg and @gsomlo for the feedback. This is merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants