Changeset 257

Timestamp:

Aug 26, 2012, 7:14:14 PM (12 years ago)

Author:

almaless

Message:

• Adding two arguments: BLKSZ (sector size) and THREADS (OpenMP threads number).
• Use the default file name for ALMOS related files.
• Let the default Hard Disk Drive (H.D.D) file system image to be "hdd-img.bin".

File:

• trunk/platforms/tsarv4_generic_mmu/top.cpp (modified) (7 diffs)

trunk/platforms/tsarv4_generic_mmu/top.cpp

@@ -61 +61 @@
 //      OS
 ///////////////////////////////////////////////////
-
 #define USE_ALMOS 0
-#define almos_bootloader_pathname "/Users/alain/soc/tsar-svn-june-2010/softs/almos/bootloader/bin/bootloader-soclib-mipsel.bin" 
-#define almos_kernel_pathname "/Users/alain/soc/tsar-svn-june-2010/softs/almos/kernel/bin/kernel-soclib-mipsel.bin@0xbfc10000:D"
-#define almos_archinfo_pathname "/Users/alain/soc/tsar-svn-june-2010/softs/almos/arch_bins/arch-info_4_4.bin@0xBFC08000:D"
+
+#define almos_bootloader_pathname "bootloader.bin"
+#define almos_kernel_pathname     "kernel-soclib.bin@0xbfc10000:D"
+#define almos_archinfo_pathname   "arch-info.bin@0xBFC08000:D"
 
 ///////////////////////////////////////////////////
 //               Parallelisation
 ///////////////////////////////////////////////////
-
 #define USE_OPENMP               0
-#define OPENMP_THREADS_NR        8
 
 #if USE_OPENMP
 #include <omp.h>
 #endif
+///////////////////////////////////////////////////
 
 //  cluster index (computed from x,y coordinates)
@@ -123 +122 @@
 
 #define BDEV_SECTOR_SIZE      512
-#define BDEV_IMAGE_NAME       "/Users/alain/Documents/licence/almo_svn_2011/soft/giet_vm/display/images.raw"
-
-#define BOOT_SOFT_NAME        "/Users/alain/Documents/licence/almo_svn_2011/soft/giet_vm/soft.elf"
+#define BDEV_IMAGE_NAME       "hdd-img.bin"
+
+#define BOOT_SOFT_NAME        "soft.bin"
 
 #define MAX_FROZEN_CYCLES     10000
@@ -217 +216 @@
    size_t   blk_size       = BDEV_SECTOR_SIZE;   // block size (in bytes)
    size_t   xram_latency   = XRAM_LATENCY;       // external RAM latency
+   ssize_t  threads_nr     = 1;                  // simulator's threads number
    bool     debug_ok       = false;              // trace activated
    size_t   debug_period   = 1;                  // trace period
@@ -281 +281 @@
             strcpy(disk_name, argv[n+1]);
          }
+         else if ((strcmp(argv[n],"-BLKSZ") == 0) && ((n+1) < argc))
+         {
+            blk_size = atoi(argv[n+1]);
+         }
          else if ((strcmp(argv[n],"-TRACE") == 0) && (n+1<argc) )
          {
@@ -309 +313 @@
          {
             xram_latency = atoi(argv[n+1]);
+         }
+         else if ((strcmp(argv[n], "-THREADS") == 0) && ((n+1) < argc))
+         {
+            threads_nr = atoi(argv[n+1]);
+            threads_nr = (threads_nr < 1) ? 1 : threads_nr;
          }
          else if ((strcmp(argv[n], "-FROZEN") == 0) && (n+1 < argc))
@@ -325 +334 @@
             std::cout << "     -SOFT pathname_for_embedded_soft" << std::endl;
             std::cout << "     -DISK pathname_for_disk_image" << std::endl;
+            std::cout << "     -BLKSZ disk sector size" << std::endl;
             std::cout << "     -NCYCLES number_of_simulated_cycles" << std::endl;
             std::cout << "     -NPROCS number_of_processors_per_cluster" << std::endl;
@@ -337 +347 @@
             std::cout << "     -XFB fram_buffer_number_of_pixels" << std::endl;
             std::cout << "     -YFB fram_buffer_number_of_lines" << std::endl;
+            std::cout << "     -THREADS simulator's threads number" << std::endl;
             std::cout << "     -FROZEN max_number_of_lines" << std::endl;
             std::cout << "     -PERIOD number_of_cycles between trace" << std::endl;