Merge pull request #2464 from whitepau/simplify-niosv-sim

Simplify niosv sim

Author: jimmytwei

DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/niosv/.gitignore

@@ -11,4 +11,18 @@ pd_system_tb
 # ignore generated RTL for Platform Designer system
 /ip/*/*/
 !/ip/*/
-!/ip/*/*.ip
+!/ip/*/*.ip
+
+# ignore Questa outputs
+transcript
+simulation_files/libraries
+simulation_files/*.ver
+simulation_files/*.ini
+simulation_files/transcript
+simulation_files/*.wlf
+simulation_files/*.vstf
+simulation_files/*.dat
+simulation_files/*.hex
+simulation_files/*.mif
+simulation_files/*.f
+simulation_files/*.log

DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/niosv/README.md

@@ -263,7 +263,7 @@ You can manually follow the steps below, or run the `build_and_sim_testsystem.tc
 
 1. Navigate to the `/simulation_files` directory
 
-2. Run the simulation script:
+2. Run the simulation script (this happens automatically if you use `build_and_sim_testsystem.tcl`):
 
     ```bash
     vsim -c -do test_nios_commandline.tcl
@@ -281,11 +281,20 @@ You can manually follow the steps below, or run the `build_and_sim_testsystem.tc
     # Software will now exit.
     ```
 
->**Note**: If you encounter any issues with long paths when compiling under Windows*, you may have to create your 'build' directory in a shorter path, for example `C:\samples\build`. You can then run cmake from that directory, and provide cmake with the full path to your sample directory, for example:
+4. View the simulation waveform:
+
+    ```bash
+    vsim -view simulation_files/vsim.wlf -do simulation_files/wave.do
+    ```
+
+
+>**Note**: If you encounter any issues with long paths when compiling under Windows*, you may have to copy this code sample (that is, the contents of the `niosv` direcotry) to a directory with a shorter path, for example `C:\niosv`. You can then run the `build_and_sim_testsystem.tcl` script from that directory, for example:
 >
->  ```
-  > C:\samples\build> cmake -G "NMake Makefiles" C:\long\path\to\code\sample\CMakeLists.txt
->  ```
+> ```
+> :: Shared 'include' directory contains "exception_handler.hpp".
+> SET "INCLUDE=C:\long\path\to\code\sample\..\..\include;%INCLUDE%"
+> C:\niosv> quartus_sh.exe -t build_and_sim_testsystem.tcl
+> ```
 ## License
 
 Code samples are licensed under the MIT license. See [License.txt](/License.txt) for details.

DirectProgramming/C++SYCL_FPGA/ReferenceDesigns/niosv/simulation_files/.gitignore

@@ -1,5 +1,5 @@
-add wave -group "Nios V" -radix hexadecimal -position insertpoint sim:/pd_system_tb/pd_system_inst/nios/*
-add wave -group "Code & Data RAM" -radix hexadecimal -position insertpoint sim:/pd_system_tb/pd_system_inst/code_data_ram/*
-add wave -group "Accelerator" -radix hexadecimal -position insertpoint sim:/pd_system_tb/pd_system_inst/simple_dma_accelerator/*
+add wave -group "Nios V" -radix hexadecimal -position insertpoint /pd_system_tb/pd_system_inst/nios/*
+add wave -group "Code & Data RAM" -radix hexadecimal -position insertpoint /pd_system_tb/pd_system_inst/code_data_ram/*
+add wave -group "Accelerator" -radix hexadecimal -position insertpoint /pd_system_tb/pd_system_inst/simple_dma_accelerator/*
 
 config wave -signalnamewidth 1