GitLab will be upgraded to the 12.10.14-ce.0 on 28 Sept 2020 at 2.00pm (AEDT) to 2.30pm (AEDT). During the update, GitLab and Mattermost services will not be available. If you have any concerns with this, please talk to us at N110 (b) CSIT building.

Commit 0b8e3058 authored by John Zhang's avatar John Zhang

updated SOM test; clock callback output processing takes last line

parent ec65ef6e
som_rpyc:
som:
iterations: 10
benchmark:
name: SOM
iterations: 1
source: targetrpysom.py
args:
- -cp
- /Users/johnz/Documents/Work/RPySOM/Smalltalk
- /Users/johnz/Documents/Work/RPySOM/TestSuite/TestHarness.som
environ:
PYPY_USESSION_DIR: example # controls where PyPy puts usession directory
PYPY_USESSION_BASENAME: som_rpyc
PYTHONPATH: /Users/johnz/Documents/Work/RPySOM/src
language:
name: rpython
backend: c # required
callback:
name: ClockCallback
param: "6"
compiler:
pypy_dir: /Users/johnz/Documents/Work/mu-client-pypy # required by rpython
flags:
- --gc=none
som_rpyzebu:
benchmark:
name: SOM
iterations: 1
source: targetrpysom.py
args:
- -cp
- /home/isaacg/RPySOM/Smalltalk
- /home/isaacg/RPySOM/TestSuite/TestHarness.som
language:
name: rpython
backend: mu
impl: zebu
- $RPYSOM/Smalltalk
- $RPYSOM/TestSuite/TestHarness.som
callback:
name: ClockCallback
name: clock
param: "6"
environ: # can define environment variables that are passed to compiler and runner
PYPY_MU: /home/isaacg/mu-client-pypy
MU_ZEBU: /home/isaacg/mu-impl-fast
ZEBU_BUILD: release
environ:
PYPY_USESSION_DIR: example # controls where PyPy puts usession directory
PYPY_USESSION_BASENAME: som_rpyzebu
PYTHONPATH: /home/isaacg/RPySOM/src
compiler:
pypy_dir: $PYPY_MU # can use environment variables in paths
PYTHONPATH: $RPYSOM/src
tasks:
rpyc_O3:
language:
name: rpython
backend: c
source: targetrpysom.py
environ:
PYPY_C_CLANG_OPT: -O3
PYPY_USESSION_BASENAME: som_rpyc_O3
rpyzebu:
language:
name: rpython
backend: mu
impl: zebu
source: targetrpysom.py
environ:
ZEBU_BUILD: "release"
PYPY_USESSION_BASENAME: som_rpyzebu
......@@ -54,4 +54,4 @@ def process_subproc_output(output_d):
return output_d['t_proc']
def process_clock_callback_output(output_d):
return float(output_d['stdout'])
return float(output_d['stdout'].split()[-1]) # catch only the last line.
......@@ -22,20 +22,18 @@ def target(driver, args):
def entry_point(argv):
cb_param = argv[1]
iter = int(argv[2])
cb = cb_cls(cb_param)
cb.begin()
retcode = 1
for i in range(iter):
try:
print [argv[0]] + argv[3:]
main([argv[0]] + argv[3:])
except Exit, e:
retcode = e.code
except Exception, e:
os.write(2, "ERROR: %s thrown during execution.\n" % e)
retcode = 1
cb.end()
try:
main([argv[0]] + argv[2:])
except Exit, e:
retcode = e.code
except Exception, e:
os.write(2, "ERROR: %s thrown during execution.\n" % e)
retcode = 1
cb.end()
cb.report()
return retcode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment