Changeset 546 for trunk

Timestamp:

Oct 7, 2013, 5:23:44 PM (11 years ago)

Author:

meunier

Message:

Rajout du composant Sim Helper dans le répertoire soft/test_llsc pour l'outil de test automatisé du LL/SC

Location:

trunk/softs/test_llsc

Files:

• scripts/LLSCTestGenerator/Program.hpp (modified) (1 diff)
• scripts/test_llsc.py (modified) (1 diff)
• scripts/tsarch.py (modified) (1 diff)
• top.cpp (modified) (5 diffs)

trunk/softs/test_llsc/scripts/LLSCTestGenerator/Program.hpp

@@ -107 +107 @@
       res << "   }" << endl;
       res << endl;
-      res << "   *(unsigned int *) 0x0 = 0xDEADDEAD;" << endl;
+      res << "   giet_raise_sigint();" << endl;
       res << endl;
       res << "   srl_exit();" << endl;

trunk/softs/test_llsc/scripts/test_llsc.py

@@ -99 +99 @@
 
 mpr.map(tcg, code = 'PSEG_RAM_0', data = 'PSEG_RAM_0', ptab = "PSEG_RAM_0")
-mpr.map('system', boot = 'PSEG_ROM', kernel = 'PSEG_RAM_0', scheduler = True)
+mpr.map('system', boot = 'PSEG_RAM_0', kernel = 'PSEG_RAM_0', scheduler = True)
 
-mpr.generate(dsx.Giet(outdir = '.', vaddr_replicated_peri_inc = 0x100000))
+mpr.generate(dsx.Giet(outdir = '.', vaddr_replicated_peri_inc = 0x2000, debug = True))
 

trunk/softs/test_llsc/scripts/tsarch.py

@@ -15 +15 @@
     hd.add(Fbf('PSEG_FBF', pbase = 0xB2000000, channel_size = 352 * 288 * 2, nb_channel = 1))
     hd.add(Ioc('PSEG_IOC', pbase = 0xB3000000, channel_size = 32, nb_channel = 1))
+    hd.add(SimH('PSEG_SIMH', pbase = 0xB7000000, channel_size = 32, nb_channel = 1)) # 6 mapped registers
 
     hd.add(Xicu('PSEG_XICU', pbase = 0xB0000000, channel_size = 32, nb_channel = nb_proc, replicated = True)) # name suffixed with "_<num_cluster>"

trunk/softs/test_llsc/top.cpp

@@ -166 +166 @@
 #ifdef USE_GIET
 #include "scripts/soft/hard_config.h"
-#define PREFIX_OS "/users/cao/meunier/src/giet_vm/"
+#define PREFIX_OS "giet_vm/"
 #endif
 
@@ -272 +272 @@
    #define MDMA_BASE    0x00B1000000
    #define MDMA_SIZE    0x0000001000 * NB_DMA_CHANNELS  // 4 Kbytes per channel
+
+   #define SIMH_BASE    0x00B7000000
+   #define SIMH_SIZE    0x0000001000
 #endif
 
@@ -322 +325 @@
 #define BROM_TGTID      7
 #define CDMA_TGTID      8
+#define SIMH_TGTID      9
 
 bool stop_called = false;
@@ -567 +571 @@
             maptabd.add(Segment("seg_cdma", CDMA_BASE, CDMA_SIZE, 
                         IntTab(cluster(x,y),CDMA_TGTID), false));
+            maptabd.add(Segment("seg_simh", SIMH_BASE, SIMH_SIZE, 
+                        IntTab(cluster(x,y),SIMH_TGTID), false));
          }
       }
@@ -699 +705 @@
                 CDMA_TGTID,
                 BDEV_TGTID,
+                SIMH_TGTID,
                 MEMC_WAYS,
                 MEMC_SETS,