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

🚀 Upgraded dependencies further integration #84

Merged
merged 3 commits into from
Jun 8, 2024
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "environment/nix/nix-eda"]
path = environment/nix/nix-eda
url = [email protected]:daquintero/nix-eda.git
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
rev: ad3ff374e97e29ca87c94b5dc7eccdd29adc6296
hooks:
- id: codespell
args: ["-L TE,TE/TM,te,ba,FPR,fpr_spacing,ro,nd,donot,schem,Synopsys,ket,inout" ]
args: ["-L TE,TE/TM,te,ba,FPR,fpr_spacing,ro,nd,donot,schem,Synopsys,ket,inout,astroid" ]
additional_dependencies:
- tomli

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/examples/00_setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# # Project Setup Example

# ## Enter Docker Environment
# ## Within [IIC-OSIC-TOOLS](https://github.com/iic-jku/IIC-OSIC-TOOLS)
#
# We first enter the Docker environment by running:
# ```
Expand Down
1 change: 1 addition & 0 deletions docs/examples/01_run_openlane_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@
design_directory=amaranth_driven_flow,
only_generate_flow_setup=True,
)
# TODO fix warnings

# This should generate a `openlane 2` driven layout in the `amaranth_driven_flow` directory if you change the `only_generate_configuration` flag to `True`. Let's list the available runs in this project:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,13 @@
)
# -

# ## `cocoTb` Simulation
# ## `cocotb` Simulation

# It is strongly encouraged to get familiar with the `piel` flow project structure, as this file directory distribution enables the easy use between multiple design tools without conflicts or without structured organisation.

# Location of our output files

design_directory = piel.return_path(simple_design)
source_output_files_directory = (
piel.get_module_folder_type_location(
module=simple_design, folder_type="digital_source"
Expand Down Expand Up @@ -189,6 +190,19 @@
design_sources_list=list((design_directory / "src").iterdir()),
)

# ```shell
# # #!/bin/bash
# # Makefile
# SIM ?= icarus
# TOPLEVEL_LANG ?= verilog
# VERILOG_SOURCES += /home/daquintero/phd/piel/docs/examples/designs/simple_design/simple_design/src/adder.vhdl
# VERILOG_SOURCES += /home/daquintero/phd/piel/docs/examples/designs/simple_design/simple_design/src/adder.sv
# TOPLEVEL := adder
# MODULE := test_adder
# include $(shell cocotb-config --makefiles)/Makefile.sim
# PosixPath('/home/daquintero/phd/piel_private/docs/examples/designs/simple_design/simple_design/tb/Makefile')
# ```

# Now we can create the simulation output files from the `makefile`. Note this will only work in our configured Linux environment.

# Run cocotb simulation
Expand Down Expand Up @@ -224,6 +238,7 @@
# Now we can plot the corresponding data using the built-in interactive `bokeh` signal analyser function:

piel.simple_plot_simulation_data(example_simple_simulation_data)
# TODO fix this properly.

# This looks like this:

Expand Down
21 changes: 10 additions & 11 deletions docs/examples/02_digital_design_simulation/our_truth_table_module.v
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
/* Generated by Yosys 0.30+48 (git sha1 14d50a176d5, clang++ 11.1.0 -fPIC -Os) */
/* Generated by Amaranth Yosys 0.40 (PyPI ver 0.40.0.0.post95, git sha1 a1bb0255d) */

(* \amaranth.hierarchy = "top" *)
(* top = 1 *)
(* generator = "Amaranth" *)
module top(phase_map_out, detector_in);
reg \$auto$verilog_backend.cc:2097:dump_module$1 = 0;
(* src = "/home/daquintero/piel/piel/tools/amaranth/construct.py:43" *)
reg \$auto$verilog_backend.cc:2352:dump_module$1 = 0;
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
input [1:0] detector_in;
wire [1:0] detector_in;
(* src = "/home/daquintero/piel/piel/tools/amaranth/construct.py:43" *)
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
output [1:0] phase_map_out;
reg [1:0] phase_map_out;
always @* begin
if (\$auto$verilog_backend.cc:2097:dump_module$1 ) begin end
if (\$auto$verilog_backend.cc:2352:dump_module$1 ) begin end
(* full_case = 32'd1 *)
(* src = "/home/daquintero/piel/piel/tools/amaranth/construct.py:57" *)
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:61" *)
casez (detector_in)
/* src = "/home/daquintero/piel/piel/tools/amaranth/construct.py:60" */
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
2'h0:
phase_map_out = 2'h0;
/* src = "/home/daquintero/piel/piel/tools/amaranth/construct.py:60" */
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
2'h1:
phase_map_out = 2'h2;
/* src = "/home/daquintero/piel/piel/tools/amaranth/construct.py:60" */
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
2'h2:
phase_map_out = 2'h3;
/* src = "/home/daquintero/piel/piel/tools/amaranth/construct.py:60" */
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
2'h3:
phase_map_out = 2'h3;
endcase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$comment Generated by Amaranth $end
$date 2023-08-25 09:34:27.507234 $end
$date 2024-06-06 15:46:07.081849 $end
$timescale 1 ps $end
$scope module bench $end
$scope module top $end
$var wire 2 ! phase_map_out $end
$var wire 2 " detector_in $end
$var wire 2 ! detector_in $end
$var wire 2 " phase_map_out $end
$upscope $end
$upscope $end
$enddefinitions $end
Expand All @@ -14,11 +14,11 @@ b0 !
b0 "
$end
#1000000
b1 "
b10 !
#2000000
b10 "
b11 !
#3000000
b1 !
#2000000
b11 "
b10 !
#3000000
b11 !
#4000000
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
parallel_0
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/* Generated by Yosys 0.38 (git sha1 543faed9c8c, clang++ 16.0.6 -fPIC -Os) */

(* top = 1 *)
(* generator = "Amaranth" *)
module top(\output , \input );
reg \$auto$verilog_backend.cc:2334:dump_module$1 = 0;
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
input [3:0] \input ;
wire [3:0] \input ;
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
output [3:0] \output ;
reg [3:0] \output ;
always @* begin
if (\$auto$verilog_backend.cc:2334:dump_module$1 ) begin end
(* full_case = 32'd1 *)
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:61" *)
casez (\input )
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h0:
\output = 4'h5;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h1:
\output = 4'hc;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h2:
\output = 4'h5;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h3:
\output = 4'h6;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h4:
\output = 4'h2;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h5:
\output = 4'hd;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h6:
\output = 4'h6;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h7:
\output = 4'h3;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h8:
\output = 4'h9;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h9:
\output = 4'he;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'ha:
\output = 4'h4;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hb:
\output = 4'h8;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hc:
\output = 4'h1;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hd:
\output = 4'hb;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'he:
\output = 4'hf;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hf:
\output = 4'ha;
endcase
end
endmodule
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env python
from distutils.core import setup

setup(
name="parallel_0",
version="0.0.1",
description="Example empty piel project.",
author="Dario Quintero",
author_email="[email protected]",
url="https://github.com/daquintero/piel",
packages=["parallel_0"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
parallel_1
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/* Generated by Yosys 0.38 (git sha1 543faed9c8c, clang++ 16.0.6 -fPIC -Os) */

(* top = 1 *)
(* generator = "Amaranth" *)
module top(\output , \input );
reg \$auto$verilog_backend.cc:2334:dump_module$1 = 0;
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
input [3:0] \input ;
wire [3:0] \input ;
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
output [3:0] \output ;
reg [3:0] \output ;
always @* begin
if (\$auto$verilog_backend.cc:2334:dump_module$1 ) begin end
(* full_case = 32'd1 *)
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:61" *)
casez (\input )
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h0:
\output = 4'h5;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h1:
\output = 4'hc;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h2:
\output = 4'h5;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h3:
\output = 4'h6;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h4:
\output = 4'h2;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h5:
\output = 4'hd;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h6:
\output = 4'h6;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h7:
\output = 4'h3;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h8:
\output = 4'h9;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h9:
\output = 4'he;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'ha:
\output = 4'h4;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hb:
\output = 4'h8;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hc:
\output = 4'h1;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hd:
\output = 4'hb;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'he:
\output = 4'hf;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hf:
\output = 4'ha;
endcase
end
endmodule
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env python
from distutils.core import setup

setup(
name="parallel_1",
version="0.0.1",
description="Example empty piel project.",
author="Dario Quintero",
author_email="[email protected]",
url="https://github.com/daquintero/piel",
packages=["parallel_1"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
parallel_2
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/* Generated by Yosys 0.38 (git sha1 543faed9c8c, clang++ 16.0.6 -fPIC -Os) */

(* top = 1 *)
(* generator = "Amaranth" *)
module top(\output , \input );
reg \$auto$verilog_backend.cc:2334:dump_module$1 = 0;
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
input [3:0] \input ;
wire [3:0] \input ;
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:47" *)
output [3:0] \output ;
reg [3:0] \output ;
always @* begin
if (\$auto$verilog_backend.cc:2334:dump_module$1 ) begin end
(* full_case = 32'd1 *)
(* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:61" *)
casez (\input )
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h0:
\output = 4'h5;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h1:
\output = 4'hc;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h2:
\output = 4'h5;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h3:
\output = 4'h6;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h4:
\output = 4'h2;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h5:
\output = 4'hd;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h6:
\output = 4'h6;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h7:
\output = 4'h3;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h8:
\output = 4'h9;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'h9:
\output = 4'he;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'ha:
\output = 4'h4;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hb:
\output = 4'h8;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hc:
\output = 4'h1;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hd:
\output = 4'hb;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'he:
\output = 4'hf;
/* src = "/home/daquintero/phd/piel_private/piel/tools/amaranth/construct.py:64" */
4'hf:
\output = 4'ha;
endcase
end
endmodule
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env python
from distutils.core import setup

setup(
name="parallel_2",
version="0.0.1",
description="Example empty piel project.",
author="Dario Quintero",
author_email="[email protected]",
url="https://github.com/daquintero/piel",
packages=["parallel_2"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
parallel_3
Loading