changeset 47:97d1959f7c5c pygar svn.48

[svn r48] changed sctipt to use our own programs, changed rlp.wav and rlp1.wav to be shorter
author rlm
date Wed, 05 May 2010 13:23:58 -0400
parents adcfa79d2c67
children a139cc07b773
files benchProgs/thru.smips.vmh benchmarks/audio_processor_test/rlp.wav benchmarks/audio_processor_test/rlp1.wav config/bm/Pygar/processor_test/audio_core_benchmark.cfx modules/bluespec/Pygar/core/audioCorePipeline.bsv scripts/setup-mit-6.375-bmark-audio-core
diffstat 6 files changed, 117 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/benchProgs/thru.smips.vmh	Wed May 05 13:23:58 2010 -0400
     1.3 @@ -0,0 +1,90 @@
     1.4 +
     1.5 +@400      // <__start>
     1.6 +3c1d0002  // 00001000 lui $sp,0x2
     1.7 +0c00042c  // 00001004 jal 10b0 <main>
     1.8 +00000000  // 00001008 nop
     1.9 +00000000  // 0000100c nop
    1.10 +
    1.11 +@404      // <verify>
    1.12 +24020001  // 00001010 li $v0,1
    1.13 +03e00008  // 00001014 jr $ra
    1.14 +
    1.15 +@406      // <finishTest>
    1.16 +4084a800  // 00001018 mtc0 $a0,$21
    1.17 +08000407  // 0000101c j 101c <finishTest+4>
    1.18 +00000000  // 00001020 nop
    1.19 +
    1.20 +@409      // <setStats>
    1.21 +40845000  // 00001024 mtc0 $a0,$10
    1.22 +03e00008  // 00001028 jr $ra
    1.23 +00000000  // 0000102c nop
    1.24 +
    1.25 +@40c      // <setComp>
    1.26 +24020001  // 00001030 li $v0,1
    1.27 +4082d000  // 00001034 mtc0 $v0,$26
    1.28 +03e00008  // 00001038 jr $ra
    1.29 +00000000  // 0000103c nop
    1.30 +
    1.31 +@410      // <getSample>
    1.32 +4003c800  // 00001040 mfc0 $v1,$25
    1.33 +24020001  // 00001044 li $v0,1
    1.34 +10620004  // 00001048 beq $v1,$v0,105c <getSample+1c>
    1.35 +4005e000  // 0000104c mfc0 $a1,$28
    1.36 +00000000  // 00001050 nop
    1.37 +ac850000  // 00001054 sw $a1,0($a0)
    1.38 +03e00008  // 00001058 jr $ra
    1.39 +ac800000  // 0000105c sw $zero,0($a0)
    1.40 +00001021  // 00001060 move $v0,$zero
    1.41 +03e00008  // 00001064 jr $ra
    1.42 +
    1.43 +@41a      // <putSample>
    1.44 +4084d800  // 00001068 mtc0 $a0,$27
    1.45 +03e00008  // 0000106c jr $ra
    1.46 +00000000  // 00001070 nop
    1.47 +
    1.48 +@41d      // <runWithStats>
    1.49 +27bdffa8  // 00001074 addiu $sp,$sp,-88
    1.50 +afbf0050  // 00001078 sw $ra,80($sp)
    1.51 +0c000409  // 0000107c jal 1024 <setStats>
    1.52 +27a40010  // 00001080 addiu $a0,$sp,16
    1.53 +0c000410  // 00001084 jal 1040 <getSample>
    1.54 +00021400  // 00001088 sll $v0,$v0,0x10
    1.55 +10400003  // 0000108c beqz $v0,109c <runWithStats+28>
    1.56 +8fa40010  // 00001090 lw $a0,16($sp)
    1.57 +0c00041a  // 00001094 jal 1068 <putSample>
    1.58 +08000420  // 00001098 j 1080 <runWithStats+c>
    1.59 +00002021  // 0000109c move $a0,$zero
    1.60 +0c000409  // 000010a0 jal 1024 <setStats>
    1.61 +8fbf0050  // 000010a4 lw $ra,80($sp)
    1.62 +27bd0058  // 000010a8 addiu $sp,$sp,88
    1.63 +03e00008  // 000010ac jr $ra
    1.64 +
    1.65 +@42c      // <main>
    1.66 +27bdffe8  // 000010b0 addiu $sp,$sp,-24
    1.67 +24040001  // 000010b4 li $a0,1
    1.68 +afbf0010  // 000010b8 sw $ra,16($sp)
    1.69 +0c00041d  // 000010bc jal 1074 <runWithStats>
    1.70 +0c000404  // 000010c0 jal 1010 <verify>
    1.71 +00402021  // 000010c4 move $a0,$v0
    1.72 +0c000406  // 000010c8 jal 1018 <finishTest>
    1.73 +0c00040c  // 000010cc jal 1030 <setComp>
    1.74 +8fbf0010  // 000010d0 lw $ra,16($sp)
    1.75 +27bd0018  // 000010d4 addiu $sp,$sp,24
    1.76 +03e00008  // 000010d8 jr $ra
    1.77 +00000000  // 000010dc nop
    1.78 +
    1.79 +@438      // <_heapend>
    1.80 +00000000  // 000010e0 nop
    1.81 +
    1.82 +@439      // <environ>
    1.83 +00000000  // 000010e4 nop
    1.84 +00000000  // 000010e8 nop
    1.85 +00000000  // 000010ec nop
    1.86 +
    1.87 +@43c      // <.reginfo>
    1.88 +a000003c  // 000010f0 sb $zero,60($zero)
    1.89 +00000000  // 000010f4 nop
    1.90 +00000000  // 000010f8 nop
    1.91 +00000000  // 000010fc nop
    1.92 +00000000  // 00001100 nop
    1.93 +000090d0  // 00001104 0x90d0
     2.1 Binary file benchmarks/audio_processor_test/rlp.wav has changed
     3.1 Binary file benchmarks/audio_processor_test/rlp1.wav has changed
     4.1 --- a/config/bm/Pygar/processor_test/audio_core_benchmark.cfx	Wed May 05 12:43:51 2010 -0400
     4.2 +++ b/config/bm/Pygar/processor_test/audio_core_benchmark.cfx	Wed May 05 13:23:58 2010 -0400
     4.3 @@ -11,7 +11,9 @@
     4.4  
     4.5  my $gcfg = Asim::GenCFG->new();
     4.6  
     4.7 -my @tests = ("smipsv1_simple",
     4.8 +my @tests = (
     4.9 +              "thru",
    4.10 +              "smipsv1_simple",
    4.11  	      "smipsv1_addiu",
    4.12  	      "smipsv1_bne",
    4.13  	      "smipsv1_lw",
    4.14 @@ -27,6 +29,12 @@
    4.15  
    4.16  my @bmarks = ("null.wav", "reuben_james_1sec.wav", "rlp.wav");
    4.17  
    4.18 +
    4.19 +  
    4.20 +
    4.21 +
    4.22 +
    4.23 +
    4.24  foreach my $test (@tests) {
    4.25      $gcfg->add(name => $test,
    4.26                 tree => [ "tests" ],
     5.1 --- a/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Wed May 05 12:43:51 2010 -0400
     5.2 +++ b/modules/bluespec/Pygar/core/audioCorePipeline.bsv	Wed May 05 13:23:58 2010 -0400
     5.3 @@ -49,6 +49,11 @@
     5.4  
     5.5  module [CONNECTED_MODULE] mkConnectedApplication ();
     5.6     Core core <- mkCore;
     5.7 +   // RLM::
     5.8 +   // the simple existance of this additional core causes the dreaded
     5.9 +   // beast to emerge --- the ASSERTION FAILURE: sw/model/stats-device.cpp:317 Cycle:0
    5.10 +   //stats device: Duplicate entry DATA_CACHE_NUM_WRITEBACKS, postion 0
    5.11 +   //Core core1 <- mkCore;
    5.12     Reg#(int) cycle <- mkReg(0);
    5.13  
    5.14  //   Reg#(Bit#(32)) ac_fini <- mkReg(0);
     6.1 --- a/scripts/setup-mit-6.375-bmark-audio-core	Wed May 05 12:43:51 2010 -0400
     6.2 +++ b/scripts/setup-mit-6.375-bmark-audio-core	Wed May 05 13:23:58 2010 -0400
     6.3 @@ -70,6 +70,9 @@
     6.4  print "DST: $dstdir\n";
     6.5  print "BASE: $basedir\n";
     6.6   
     6.7 +$pygarRoot = "$srcdir/..";
     6.8 +
     6.9 +
    6.10  if (! defined($group)) {
    6.11      $group = $bmark;
    6.12  }
    6.13 @@ -87,15 +90,25 @@
    6.14          mkdir("program.${context}") or ErrorExit("Failed to make program directory");
    6.15          chdir("program.${context}") or ErrorExit("Failed to cd to program directory");
    6.16  
    6.17 +	#print "***********************\n\n$benchmark_root --- ${benchmark_root}\n\n******************************\n";
    6.18 +
    6.19          if (defined($binary)) {
    6.20              $src_prog = "${benchmark_root}/hasim/${isa}/${group}/${binary}";
    6.21          }
    6.22 +
    6.23 +	elsif (-f "$pygarRoot/benchProgs/${bmark}.${isa}.vmh"){
    6.24 +	    print"\n*******************\n rlm:using speciel Pygar program\n**************************\n";
    6.25 +	    $src_prog = "$pygarRoot/benchProgs/${bmark}.${isa}.vmh";}
    6.26 +
    6.27          elsif (-f "${benchmark_root}/hasim/${isa}/${group}/${bmark}.${isa}.bin") {
    6.28              $src_prog = "${benchmark_root}/hasim/${isa}/${group}/${bmark}.${isa}.bin";
    6.29          }
    6.30          elsif (-f "${benchmark_root}/hasim/${isa}/${group}/${bmark}.${isa}.vmh") {
    6.31              $src_prog = "${benchmark_root}/hasim/${isa}/${group}/${bmark}.${isa}.vmh";
    6.32          }
    6.33 +
    6.34 +       
    6.35 +	
    6.36          else {
    6.37              print STDERR "Can't find binary in ${benchmark_root}/hasim/${isa}/${group}\n";
    6.38              exit(1);