Changeset 969

Timestamp:

Apr 6, 2015, 10:29:16 AM (10 years ago)

Author:

cfuguet

Message:

reconf: don't use all cpus when simulating with omp.

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

• scripts/onerun.py (modified) (3 diffs)
• top.cpp (modified) (1 diff)

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

@@ -9 +9 @@
 import argparse
 import multiprocessing
+import math
 
 def run(args):
@@ -117 +118 @@
     # OpenMP number of threads definition
     ompthreads = args.threads
-    if ompthreads < 0:
-        if os.environ.get('SOCLIB_GDB') != None:
-            ompthreads = 1
-
-        elif args.debug != None:
-            ompthreads = 1
-
-        else:
-            ompthreads = (args.x * args.y) / 4
-            cpucount = multiprocessing.cpu_count()
-            if ompthreads > cpucount: ompthreads = cpucount
+    if ompthreads < 1:
+        ompthreads = math.ceil(float(args.x * args.y) / 4)
+
+        # be nice and don't use all available processors
+        maxcpu = math.ceil(float(multiprocessing.cpu_count()) * 2/3)
+        if ompthreads > maxcpu: ompthreads = maxcpu
 
     command.extend(["-THREADS", str(ompthreads)])
@@ -191 +187 @@
 
     parser.add_argument(
-        '--threads', '-t', dest='threads', default=-1,
+        '--threads', '-t', type=int, dest='threads', default=1,
         help='number of OpenMP threads')
 

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -154 +154 @@
 //               Parallelisation
 ///////////////////////////////////////////////////
+#define USE_OPENMP _OPENMP
+
 #if USE_OPENMP
 #include <omp.h>