From 0e7333d80f465e01c3ed72bf70866b4447c9413d Mon Sep 17 00:00:00 2001
From: Navid Nikaein <navid.nikaein@eurecom.fr>
Date: Fri, 12 Dec 2014 16:37:06 +0000
Subject: [PATCH] update the test 02 scripts
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6259 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
targets/TEST/OAI/case12.py | 7 +++----
targets/TEST/OAI/case13.py | 6 +++---
targets/TEST/OAI/test02.py | 15 ++++++++++-----
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/targets/TEST/OAI/case12.py b/targets/TEST/OAI/case12.py
index 92b1d8b83b..fb5bf8ba46 100644
--- a/targets/TEST/OAI/case12.py
+++ b/targets/TEST/OAI/case12.py
@@ -48,7 +48,7 @@ NUM_UE=1
NUM_eNB=1
NUM_TRIALS=3
-PRB=[25,50,100]
+PRB=[6,25,50,100]
MCS=[0,4,9,10,13,16,17,22,27]
ANT_TX=2 # 2
ANT_RX=2 # 2
@@ -65,12 +65,11 @@ FRAME=1000
-def execute(oai, user, pw, host, logfile,logdir,debug):
+def execute(oai, user, pw, host, logfile,logdir,debug,cpu):
case = '10'
oai.send('cd $OPENAIR1_DIR;')
oai.send('cd SIMULATION/LTE_PHY;')
-
try:
test = '200'
name = 'Run oai.dlsim.sanity'
@@ -110,7 +109,7 @@ def execute(oai, user, pw, host, logfile,logdir,debug):
conf = '-B' + str(PRB[i]) + ' -m'+str(MCS[j]) + ' -y'+str(k) + ' -z'+str(m) +' -c'+str(n) + ' -g'+str(CHANNEL[o]) + ' -x'+str(p) + ' -s'+str(q) + ' -w1.0 -f.1 -P -n'+str(FRAME)+' -O'+str(PERF) +' '+ OPT
trace = logdir + '/time_meas' + '_prb'+str(PRB[i])+'_mcs'+ str(MCS[j])+ '_anttx' + str(k)+ '_antrx' + str(m) + '_pdcch' + str(n) + '_channel' +str(CHANNEL[o]) + '_tx' +str(p) + '_snr' +str(q)+'.'+case+str(test)+ '.log'
tee = ' 2>&1 | tee ' + trace
- cmd = 'taskset -c 0 ./dlsim.rel8.'+ host + ' ' + conf + tee
+ cmd = 'taskset -c '+ str(cpu) + ' ./dlsim.rel8.'+ host + ' ' + conf + tee
if debug :
print cmd
diff --git a/targets/TEST/OAI/case13.py b/targets/TEST/OAI/case13.py
index 55034c7263..ba29a45a3c 100644
--- a/targets/TEST/OAI/case13.py
+++ b/targets/TEST/OAI/case13.py
@@ -48,7 +48,7 @@ NUM_UE=1
NUM_eNB=1
NUM_TRIALS=3
-PRB=[25,50,100]
+PRB=[6,25,50,100]
MCS=[0,4,9,10,13,16,17,22,27]
ANT_TX=1 # 2
ANT_RX=2 # 2
@@ -63,7 +63,7 @@ FRAME=1000
-def execute(oai, user, pw, host,logfile,logdir,debug):
+def execute(oai, user, pw, host,logfile,logdir,debug,cpu):
case = '10'
oai.send('cd $OPENAIR1_DIR;')
@@ -105,7 +105,7 @@ def execute(oai, user, pw, host,logfile,logdir,debug):
conf = '-B' + str(PRB[i]) + ' -m'+str(MCS[j]) + ' -y'+str(m) + ' -g'+str(CHANNEL[o]) + ' -x'+str(p) + ' -s'+str(q) + ' -w1.0 -e.1 -P -n'+str(FRAME)+' -O'+str(PERF)+' '+ OPT
trace = logdir + '/time_meas' + '_prb'+str(PRB[i])+'_mcs'+ str(MCS[j])+ '_antrx' + str(m) + '_channel' +str(CHANNEL[o]) + '_tx' +str(p) + '_snr' +str(q)+'.'+case+str(test)+ '.log'
tee = ' 2>&1 | tee ' + trace
- cmd = 'taskset -c 0 ./ulsim.rel8.'+ host + ' ' + conf + tee
+ cmd = 'taskset -c ' + str(cpu) + ' ./ulsim.rel8.'+ host + ' ' + conf + tee
if debug :
print cmd
diff --git a/targets/TEST/OAI/test02.py b/targets/TEST/OAI/test02.py
index c76b7480e7..b13ec05293 100644
--- a/targets/TEST/OAI/test02.py
+++ b/targets/TEST/OAI/test02.py
@@ -57,6 +57,8 @@ pw =''
i = 0
clean = 0
start_case = 0
+cpu = 0
+
for arg in sys.argv:
if arg == '-d':
debug = 1
@@ -68,6 +70,8 @@ for arg in sys.argv:
pw = sys.argv[i+1]
elif arg == '-c' :
clean = 1
+ elif arg == '-t' :
+ cpu = sys.argv[i+1]
elif arg == '-s' :
start_case = sys.argv[i+1]
elif arg == '-h' :
@@ -75,7 +79,8 @@ for arg in sys.argv:
print "-dd: high debug level"
print "-p: set the prompt"
print "-w: set the password for ssh to localhost"
- print "-c: clean the log directory "
+ print "-c: clean the log directory "
+ print "-t: set the cpu "
sys.exit()
i= i + 1
@@ -104,7 +109,7 @@ oai = openair('localdomain','localhost')
try:
user = getpass.getuser()
print '\n******* Note that the user <'+user+'> should be a sudoer *******\n'
- print '******* Connecting to the localhost <'+host+'> to perform the test *******\n'
+ print '******* Connecting to the localhost <'+host+'> to perform the test on CPU '+str(cpu)+' *******\n'
if not pw :
print "username: " + user
@@ -142,9 +147,9 @@ if clean == 1 :
#compile
rv=case11.execute(oai, user, pw, host,logfile,logdir,debug)
-if rv != 0 :
- case12.execute(oai, user, pw, host,logfile,logdir,debug)
- case13.execute(oai, user, pw, host,logfile,logdir,debug)
+if rv == 1 :
+ case12.execute(oai, user, pw, host,logfile,logdir,debug,cpu)
+ case13.execute(oai, user, pw, host,logfile,logdir,debug,cpu)
else :
print 'Compilation error: skip case 12 and 13'
--
GitLab