URL https://opencores.org/ocsvn/or1k/or1k/trunk

Subversion Repositories or1k

Compare Revisions

This comparison shows the changes necessary to convert path
```
/
```
from Rev 1270 to Rev 1271
↔ Reverse comparison
Compare Path: Rev

With Path: Rev

Rev 1270 → Rev 1271

/trunk/orp/orp_soc/sim/src/flash.in

404,8 → 404,8

414,966 → 414,1270

1381,1379 → 1685,723

2761,591 → 2409,615

3373,7 → 3045,7

3452,8 → 3124,8

3500,8 → 3172,8

3508,8 → 3180,8

3537,7 → 3209,7

3552,12 → 3224,12

3568,8 → 3240,8

3596,12 → 3268,12

3617,7 → 3289,7

3644,8 → 3316,8

3654,7 → 3326,7

3694,20 → 3366,20

3778,10 → 3450,14

3790,50 → 3466,58

3851,59 → 3535,47

3921,7 → 3593,7

3930,110 → 3602,86

4042,10 → 3690,6

4053,11 → 3697,11

4066,74 → 3710,66

4142,10 → 3778,6

4153,11 → 3785,11

4166,70 → 3798,62

4238,10 → 3862,6

4249,7 → 3869,7

4286,89 → 3906,85

4379,47 → 3995,43

4462,311 → 4074,511

/trunk/orp/orp_soc/sim/bin/tests

0,0 → 1,18

trunk/orp/orp_soc/sim/bin/tests Property changes : Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: trunk/orp/orp_soc/sim/bin/tests.other =================================================================== --- trunk/orp/orp_soc/sim/bin/tests.other (nonexistent) +++ trunk/orp/orp_soc/sim/bin/tests.other (revision 1271) @@ -0,0 +1,18 @@ +basic-icdc +basic-nocache +mul-nocache-O2 +mul-icdc-O2 +except-nocache +except-icdc +dhry-nocache-O2 +dhry-icdc-O2 +cbasic-nocache-O2 +cbasic-icdc-O0 +tick-nocache +tick-icdc +syscall-nocache +syscall-icdc +uart-nocache +uart-icdc +mmu-nocache +mmu-icdc

trunk/orp/orp_soc/sim/bin/tests.other Property changes : Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: trunk/orp/orp_soc/sim/bin/run_rtl_regression =================================================================== --- trunk/orp/orp_soc/sim/bin/run_rtl_regression (revision 1270) +++ trunk/orp/orp_soc/sim/bin/run_rtl_regression (revision 1271) @@ -6,9 +6,12 @@ # List all test cases #set simpletests=(buserr-nocache immu-nocache dmmu-nocache basic-nocache mul-nocache-O2 syscall-nocache cbasic-nocache-O2 ints1-nocache ints2-nocache \ # buserr-icdc immu-icdc dmmu-icdc basic-icdc mul-icdc-O2 syscall-icdc cbasic-icdc-O2 ints1-icdc ints2-icdc) -#set simpletests=(except_test basic-nocache mul-nocache-O2 cbasic-nocache-O2 ints1-nocache ints2-nocache \ + +#set simpletests=(basic-nocache mul-nocache-O2 cbasic-nocache-O2 ints1-nocache ints2-nocache \ # basic-icdc mul-icdc-O2 cbasic-icdc-O2 ints1-icdc ints2-icdc) -set simpletests=(dhry-nocache-O2 dhry-icdc-O2 mmu-nocache mmu-icdc basic-icdc basic-nocache mul-nocache-O2 mul-icdc-O2) + +#set simpletests=(icm-icdc icm-nocache dhry-nocache-O2 dhry-icdc-O2 mmu-nocache mmu-icdc basic-icdc basic-nocache mul-nocache-O2 mul-icdc-O2 basic-ic basic-dc) +#set simpletests=(crc32-icdc-O0 minimad dhry-nocache-O2 dhry-icdc-O2 mmu-nocache mmu-icdc basic-icdc basic-nocache mul-nocache-O2 mul-icdc-O2 basic-ic basic-dc) #set complextests=(buserr-ic immu-ic dmmu-ic basic-ic mul-ic-O2 syscall-ic cbasic-ic-O2 ints1-ic ints2-ic \ # buserr-dc immu-dc dmmu-dc basic-dc mul-dc-O2 syscall-dc cbasic-dc-O2 ints1-dc ints2-dc \ # mul-nocache-O0 cbasic-nocache-O0 \ @@ -15,27 +18,29 @@ # mul-icdc-O0 cbasic-icdc-O0 \ # mul-ic-O0 cbasic-ic-O0 \ # mul-dc-O0 cbasic-dc-O0) -set complextests=(except-nocache except-icdc cbasic-nocache-O2 cbasic-icdc-O0) -set simpletimes=(250 100 100 400 40 40 40 40 60 \ - 40 40 40 40 40 40 40 40 40) -set complextimes=(40 40 40 40 40 40 40 40 40 \ - 40 40 40 40 40 40 40 40 100 \ - 40 40 \ - 40 40 \ - 40 40 \ - 40 40) + +#set complextests=(except-nocache except-icdc cbasic-nocache-O2 cbasic-icdc-O0 tick-nocache tick-icdc \ +# syscall-nocache syscall-icdc uart-nocache uart-icdc debug-nocache debug-dc ) + +set simpletests=`cat ../bin/tests` +set complextests=() + +set simpletimes=(500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 500 ) +set complextimes=(40 40 \ + 400 140 \ + 100 40 \ + 40 40 \ + 40 40 ) set iterations=( \ - "OR1200_REGISTERED_OUTPUTS+FLASH_GENERIC+FLASH_GENERIC_REGISTERED+SRAM_GENERIC_REGISTERED" \ - "OR1200_REGISTERED_OUTPUTS+FLASH_GENERIC+OR1200_CLMODE_1TO2" \ - "OR1200_REGISTERED_OUTPUTS" \ - "" \ - "OR1200_REGISTERED_OUTPUTS+FLASH_GENERIC+FLASH_GENERIC_REGISTERED+OR1200_REGISTERED_INPUTS" \ - "OR1200_REGISTERED_OUTPUTS+FLASH_GENERIC+FLASH_GENERIC_REGISTERED+OR1200_CLMODE_1TO2" \ - "OR1200_REGISTERED_OUTPUTS+OR1200_REGISTERED_INPUTS" \ - "OR1200_REGISTERED_OUTPUTS+OR1200_REGISTERED_INPUTS+OR1200_CLMODE_1TO2" \ - "OR1200_REGISTERED_OUTPUTS+OR1200_CLMODE_1TO2" \ - "" \ - "OR1200_REGISTERED_OUTPUTS+OR1200_REGISTERED_INPUTS+FLASH_GENERIC_REGISTERED" \ + "DBG_IF_MODEL+SRAM_GENERIC_REGISTERED+OR1200_CLMODE_1TO2" \ + "DBG_IF_MODEL+OR1200_CLMODE_1TO2" \ + "DBG_IF_MODEL+FLASH_GENERIC" \ + "DBG_IF_MODEL" \ + "DBG_IF_MODEL+FLASH_GENERIC+FLASH_GENERIC_REGISTERED" \ + "DBG_IF_MODEL+FLASH_GENERIC+FLASH_GENERIC_REGISTERED+SRAM_GENERIC_REGISTERED" \ + "DBG_IF_MODEL+FLASH_GENERIC+FLASH_GENERIC_REGISTERED+OR1200_CLMODE_1TO2" \ + "DBG_IF_MODEL+FLASH_GENERIC+FLASH_GENERIC_REGISTERED+SRAM_GENERIC_REGISTERED+OR1200_CLMODE_1TO2" \ + "DBG_IF_MODEL+SRAM_GENERIC_REGISTERED" \ "") # Process arguments @@ -67,26 +72,26 @@ set i = 0; foreach test ($tests) @ i += 1; - echo -n " Test ${i}: ${test}, $maxtimes[$i] ms\t" + /bin/echo -n -e " Test ${i}: ${test}, $maxtimes[$i] ms\t" if ((${i} % 2) == 0) then - echo "" + /bin/echo -e "" endif end -echo "" +/bin/echo -e "" set i = 1; while ($iterations[$i] != "") - echo " Iteration ${i}: ${iterations[$i]}\t" + /bin/echo -e " Iteration ${i}: ${iterations[$i]}\t" @ i += 1; end # Prepare all .args files iteration: -echo "" -echo "<<<" -echo "<<< Iteration ${iter}: ${iterations[$iter]}" -echo "<<<" +/bin/echo -e "" +/bin/echo -e "<<<" +/bin/echo -e "<<< Iteration ${iter}: ${iterations[$iter]}" +/bin/echo -e "<<<" if (${iterations[$iter]} != "") then ncprep +define+${iterations[$iter]} -f ../bin/nc.scr > ncprep.out else @@ -93,39 +98,39 @@ ncprep -f ../bin/nc.scr > ncprep.out endif if (`tail -1 ncprep.out | grep Failed` != "") then - echo "" + /bin/echo -e "" cat ncprep.out exit endif # Run NC-Verilog compiler -echo "" -echo "\t@@@" -echo "\t@@@ Compiling sources" -echo "\t@@@" +/bin/echo -e "" +/bin/echo -e "\t@@@" +/bin/echo -e "\t@@@ Compiling sources" +/bin/echo -e "\t@@@" ncvlog -NOCOPYRIGHT -f ncvlog.args > ncvlog.out if ($status != 0) then - echo "\t@@@ FAILED" - echo "" + /bin/echo -e "\t@@@ FAILED" + /bin/echo -e "" cat ncvlog.out exit else - echo "\t@@@ Passed" + /bin/echo -e "\t@@@ Passed" endif # Run the NC-Verilog elaborator (build the design hierarchy) -echo "" -echo "\t@@@" -echo "\t@@@ Building design hierarchy (elaboration)" -echo "\t@@@" +/bin/echo -e "" +/bin/echo -e "\t@@@" +/bin/echo -e "\t@@@ Building design hierarchy (elaboration)" +/bin/echo -e "\t@@@" ncelab -NOTIMINGCHECKS -NOCOPYRIGHT -f ncelab.args > ncelab.out if ($status != 0) then - echo "\t@@@ FAILED" - echo "" + /bin/echo -e "\t@@@ FAILED" + /bin/echo -e "" cat ncelab.out exit else - echo "\t@@@ Passed" + /bin/echo -e "\t@@@ Passed" endif # Run the NC-Verilog simulator (simulate the design) @@ -133,17 +138,17 @@ set i = 0; foreach test ($tests) @ i += 1; - echo "" - echo "\t###" - echo "\t### Running test ${i}: ${test}, $maxtimes[$i] ms" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Running test ${i}: ${test}, $maxtimes[$i] ms" + /bin/echo -e "\t###" - echo "database -open waves -into ../out/wave/i${iter}-${test} -default" > sim.tcl - echo "probe -create -shm xess_top -all -variables -depth all" >> sim.tcl - echo "probe -create -shm or1200_monitor -all -variables -depth all" >> sim.tcl - echo "stop -create -time $maxtimes[$i]ms -relative" >> sim.tcl - echo "run" >> sim.tcl - echo "quit" >> sim.tcl + /bin/echo -e "database -open waves -into ../out/wave/i${iter}-${test} -default" > sim.tcl + /bin/echo -e "probe -create -shm xess_top -all -variables -depth all" >> sim.tcl + /bin/echo -e "probe -create -shm or1200_monitor -all -variables -depth all" >> sim.tcl + /bin/echo -e "stop -create -time $maxtimes[$i]ms -relative" >> sim.tcl + /bin/echo -e "run" >> sim.tcl + /bin/echo -e "quit" >> sim.tcl cp ../src/${test}.hex ../src/flash.in ncsim -NOCOPYRIGHT -f ncsim.args > ncsim.out @@ -154,11 +159,11 @@ set magic=`grep report general.log | tail -1 | cut -d'(' -f2 | cut -d')' -f1 | cut -d' ' -f1` set magictime=`tail -1 general.log | cut -d'n' -f1` if ($magic == "deaddead") then - echo "\t### Passed (@time $magictime)" + /bin/echo -e "\t### Passed (@time $magictime)" @ all_tests += 1; else - echo "\t### FAILED (@time $magictime, magic# 0x$magic)" - echo ../log/i${iter}-${test}-general.log: + /bin/echo -e "\t### FAILED (@time $magictime, magic# 0x$magic)" + /bin/echo ../log/i${iter}-${test}-general.log: cat general.log @ failed += 1; @ all_tests += 1; @@ -176,10 +181,10 @@ if ($iterations[$iter] != "") then goto iteration else - echo "" - echo "<<<" - echo "<<< End of Regression Iterations" - echo "<<<" - echo "<<< Failed $failed out of $all_tests" - echo "<<<" + /bin/echo -e "" + /bin/echo -e "<<<" + /bin/echo -e "<<< End of Regression Iterations" + /bin/echo -e "<<<" + /bin/echo -e "<<< Failed $failed out of $all_tests" + /bin/echo -e "<<<" endif

/trunk/orp/orp_soc/sim/bin/nc.scr

131,6 → 131,7

170,13 → 171,16

/trunk/orp/orp_soc/sim/bin/nc_gate.scr

0,0 → 1,164

trunk/orp/orp_soc/sim/bin/nc_gate.scr Property changes : Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Index: trunk/orp/orp_soc/sim/bin/run_sw =================================================================== --- trunk/orp/orp_soc/sim/bin/run_sw (revision 1270) +++ trunk/orp/orp_soc/sim/bin/run_sw (revision 1271) @@ -7,15 +7,7 @@ # List all test cases set alldirs=( ../../sw/dhry ../../sw/mmu ../../sw/basic ../../sw/mul ../../sw/except \ ../../sw/cbasic ../../sw/tick ../../sw/syscall ../../sw/uart ) -set alltests=(dhry-nocache-O2 dhry-icdc-O2 \ - mmu-nocache mmu-icdc basic-icdc \ - basic-nocache \ - mul-nocache-O2 mul-icdc-O2 \ - except-nocache except-icdc \ - cbasic-nocache-O2 cbasic-icdc-O0 \ - tick-nocache tick-icdc \ - syscall-nocache syscall-icdc \ - uart-nocache uart-icdc ) +set alltests=`cat ../bin/tests` # Process arguments if ($1 == "single") then @@ -28,45 +20,45 @@ rm -rf ../log/s-* foreach dir ($alldirs) @ i += 1; - echo "" - echo "\t###" - echo "\t### Clean: $dir" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Clean: $dir" + /bin/echo -e "\t###" cd $dir make clean end - echo "" - echo "\t###" - echo "\t### Clean: ../../sw/support" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Clean: ../../sw/support" + /bin/echo -e "\t###" cd ../../sw/support make clean - echo "" - echo "\t###" - echo "\t### Clean: ../../sw/utils" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Clean: ../../sw/utils" + /bin/echo -e "\t###" cd ../../sw/utils make clean exit 0; else if ($1 == "build") then - echo "" - echo "\t###" - echo "\t### Build: ../../sw/utils" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Build: ../../sw/utils" + /bin/echo -e "\t###" cd ../../sw/utils make - echo "" - echo "\t###" - echo "\t### Build: ../../sw/support" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Build: ../../sw/support" + /bin/echo -e "\t###" cd ../../sw/support make foreach dir ($alldirs) @ i += 1; - echo "" - echo "\t###" - echo "\t### Build: $dir" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Build: $dir" + /bin/echo -e "\t###" cd $dir make end @@ -80,13 +72,13 @@ set i = 0; foreach test ($tests) @ i += 1; - echo -n " Test ${i}: ${test}\t" + /bin/echo -n -e " Test ${i}: ${test}\t" if ((${i} % 2) == 0) then - echo "" + /bin/echo -e "" endif end -echo "" +/bin/echo -e "" # Run or1ksim sim: @@ -93,20 +85,20 @@ set i = 0; foreach test ($tests) @ i += 1; - echo "" - echo "\t###" - echo "\t### Running test ${i}: ${test}" - echo "\t###" + /bin/echo -e "" + /bin/echo -e "\t###" + /bin/echo -e "\t### Running test ${i}: ${test}" + /bin/echo -e "\t###" set test_binary=`find $alldirs -name $test.or32` - echo "run 10000000 hush\nq\n" | or32-uclinux-sim -i -f ../../sw/support/orp.cfg $test_binary >& or1ksim.log + /bin/echo -e "run 10000000 hush\nq\n" | or32-uclinux-sim -i -f ../../sw/support/orp.cfg $test_binary >& or1ksim.log set magic=`grep report or1ksim.log | tail -1 | sed -e "s/(sim) //" | cut -d'(' -f2 | cut -d')' -f1 | cut -d' ' -f1` if ($magic == "0xdeaddead") then - echo "\t### Passed" + /bin/echo -e "\t### Passed" @ all_tests += 1; else - echo "\t### FAILED (magic# $magic)" - echo ../log/s-${test}-or1ksim.log: + /bin/echo -e "\t### FAILED (magic# $magic)" + /bin/echo ../log/s-${test}-or1ksim.log: cat or1ksim.log @ failed += 1; @ all_tests += 1; @@ -118,7 +110,7 @@ endif end - echo "" - echo "<<<" - echo "<<< Failed $failed out of $all_tests" - echo "<<<" + /bin/echo -e "" + /bin/echo -e "<<<" + /bin/echo -e "<<< Failed $failed out of $all_tests" + /bin/echo -e "<<<"

Browse

Tools

Subversion Repositories or1k

Compare Revisions

Rev 1270 → Rev 1271