Changeset 906

Timestamp:

Dec 12, 2014, 4:52:47 PM (10 years ago)

Author:

cfuguet

Message:

reconf: improve platform configuration scripts for OpenMP

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

• Makefile (modified) (2 diffs)
• scripts/onerun.py (modified) (2 diffs)
• soclib.conf (modified) (1 diff)
• top.cpp (modified) (2 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/Makefile

@@ -1 +1 @@
 TAGS := cscope.out
-
 SOCLIB_CC_ARGS :=
-SOCLIB_CC_ARGS += "-b caba:reconf:vci_xicu"
 
 all: simul.x
@@ -8 +6 @@
 
 simul.x: top.cpp top.desc
-        soclib-cc $(SOCLIB_CC_ARGS) -p top.desc -I. -o simul.x
+        soclib-cc $(SOCLIB_CC_ARGS) -P -p top.desc -I. -o simul.x
 
 $(TAGS): top.desc

branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py

@@ -8 +8 @@
 import faultyprocs
 import argparse
+import multiprocessing
 
 def run(args):
@@ -86 +87 @@
         os.environ["SOCLIB_TTY"] = "FILES"
 
-    if (args.x * args.y) <= 4:
-        ompthreads = args.x * args.y
-    elif (args.x * args.y) <= 16:
-        ompthreads = 4
-    else:
-        ompthreads = 8
+    ompthreads = (args.x * args.y) / 4
+    cpucount = multiprocessing.cpu_count()
+    if ompthreads > cpucount: ompthreads = cpucount
 
     print "[ run.py ] starting simulation"

branches/reconfiguration/platforms/tsar_generic_iob/soclib.conf

@@ -1 +1 @@
 # append compilation flags
 cflags = config.default.toolchain.cflags
-cflags.extend(['-DUSE_OPENMP=0'])
+if config.default == config.envsystemcassomp:
+        cflags.extend(['-DUSE_OPENMP=1'])
+else:
+        cflags.extend(['-DUSE_OPENMP=0'])
 #cflags.extend(['-ggdb'])
 config.default.toolchain.set("cflags", cflags)

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -513 +513 @@
    omp_set_dynamic(false);
    omp_set_num_threads(threads_nr);
-   std::cerr << "Built with openmp version " << _OPENMP << std::endl;
+   std::cerr << "Built with openmp version " << _OPENMP
+             << " / numthreads = " << threads_nr << std::endl;
 #endif
 
@@ -1503 +1504 @@
 
    // cycles between stats
-   const size_t stats_period = 100000;
+   const size_t stats_period = 150000;
    const size_t simul_period = debug_ok ? debug_period : stats_period;