Align fixture_hyperbus and keep one models/s27ks0641 make target.

pulp-platform · May 19, 2023 · 0463324 · 0463324
1 parent 5212142
commit 0463324
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -41,12 +41,10 @@ sim_clean:
 	rm -rf scripts/compile.tcl
 	rm -rf work
 
-models/s27ks0641:
-	mkdir -p $@
-
 # Download (partially non-free) simulation models from publically available sources;
 # by running these targets or targets depending on them, you accept this (see README.md).
-models/s27ks0641/s27ks0641.v: models/s27ks0641
+models/s27ks0641:
+	mkdir -p $@
 	rm -rf model_tmp && mkdir model_tmp
 	cd model_tmp; wget https://www.infineon.com/dgdl/Infineon-S27KL0641_S27KS0641_VERILOG-SimulationModels-v05_00-EN.zip?fileId=8ac78c8c7d0d8da4017d0f6349a14f68
 	cd model_tmp; mv 'Infineon-S27KL0641_S27KS0641_VERILOG-SimulationModels-v05_00-EN.zip?fileId=8ac78c8c7d0d8da4017d0f6349a14f68' model.zip
@@ -57,7 +55,7 @@ models/s27ks0641/s27ks0641.v: models/s27ks0641
 	cp model_tmp/exe_folder/S27ks0641/model/s27ks0641_verilog.sdf models/s27ks0641/s27ks0641.sdf
 	rm -rf model_tmp
 
-scripts/compile.tcl: Bender.yml models/s27ks0641/s27ks0641.v
+scripts/compile.tcl: Bender.yml models/s27ks0641
 	$(call generate_vsim, $@, -t rtl -t test -t hyper_test,..)
 
 build: scripts/compile.tcl

diff --git a/test/fixture_hyperbus.sv b/test/fixture_hyperbus.sv
@@ -217,7 +217,7 @@ module fixture_hyperbus #(
              s27ks0641 #(
                /*.mem_file_name ( "s27ks0641.mem"    ),*/
                .TimingModel   ( "S27KS0641DPBHI020"    )
-             ) i_s27ks0641 (
+             ) dut (
                .DQ7           ( pad_hyper_dq[i][7]  ),
                .DQ6           ( pad_hyper_dq[i][6]  ),
                .DQ5           ( pad_hyper_dq[i][5]  ),
@@ -241,7 +241,7 @@ module fixture_hyperbus #(
           for (genvar l=0; l<NumChips; l++) begin : sdf_annotation
              initial begin
                 automatic string sdf_file_path = "./models/s27ks0641/s27ks0641.sdf";
-                $sdf_annotate(sdf_file_path, hyperrams[p].chips[l].i_s27ks0641);
+                $sdf_annotate(sdf_file_path, hyperrams[p].chips[l].dut);
                 $display("Mem (%d,%d)",p,l);
              end
          end