From 35a3f1d45bd78e68003c9b0b118d8d8402ccf4e3 Mon Sep 17 00:00:00 2001
From: Daniel Prokesch <daniel.prokesch@gmail.com>
Date: Tue, 11 Jul 2017 10:26:37 +0200
Subject: [PATCH] some uncommitted changes

---
 experiments/cache_prefetch_lock/Makefile | 2 +-
 experiments/wcet/benchmarks.rb           | 2 +-
 experiments/wcet/run.rb                  | 1 +
 gitall                                   | 2 +-
 simutils/simutil.py                      | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/experiments/cache_prefetch_lock/Makefile b/experiments/cache_prefetch_lock/Makefile
index 58b2443..808196d 100644
--- a/experiments/cache_prefetch_lock/Makefile
+++ b/experiments/cache_prefetch_lock/Makefile
@@ -11,7 +11,7 @@ SHELL=/bin/bash
 CC = patmos-clang -mpatmos-method-cache-size=8192 \
      	-mpatmos-stack-cache-block-size=4 -mpatmos-stack-cache-size=1024 \
 	-mpatmos-disable-function-splitter -mpatmos-disable-vliw \
-	-Xllc -mpatmos-block-align=8
+	-Xllc -mpatmos-basicblock-align=8
 
 CFLAGS = -g -O2
 PASIM = pasim -G0 -m8M --gsize=32M
diff --git a/experiments/wcet/benchmarks.rb b/experiments/wcet/benchmarks.rb
index 2c51c36..07324df 100644
--- a/experiments/wcet/benchmarks.rb
+++ b/experiments/wcet/benchmarks.rb
@@ -3,7 +3,7 @@
 #
 benchfilter_from_arg()
 builds = %w{O1f} # {O0 O1 O1f O2}
-configs = %w{notrace} #  {blockglobal blocklocal minimal notrace}
+configs = %w{blockglobal blocklocal minimal notrace}
 $benchmarks = mrtc_benchmarks.select { |b|
   if b['irreducible'] || b['recursive']
     false
diff --git a/experiments/wcet/run.rb b/experiments/wcet/run.rb
index a556afe..946f75e 100644
--- a/experiments/wcet/run.rb
+++ b/experiments/wcet/run.rb
@@ -59,6 +59,7 @@ def BenchTool.import_ff(benchmark, options)
 config.options.use_trace_facts = false
 # config.options.compute_criticalities = true
 config.options.disable_ait = true
+config.options.compare_trace_facts = true
 
 # run benchmarks
 build_and_run(config, BenchTool)
diff --git a/gitall b/gitall
index 018bb00..dcde0f7 100755
--- a/gitall
+++ b/gitall
@@ -57,7 +57,7 @@ base=`dirname $self`/..
 GITBASE=$base
 
 # Names of git subdirectories in $GITBASE
-GITREPOS="patmos bench newlib compiler-rt gold llvm/tools/clang llvm misc"
+GITREPOS="patmos bench newlib compiler-rt gold llvm/tools/clang llvm misc aegean poseidon"
 
 # Color codes
 RED="\033[31m"
diff --git a/simutils/simutil.py b/simutils/simutil.py
index 07c3c8a..1faa1ca 100644
--- a/simutils/simutil.py
+++ b/simutils/simutil.py
@@ -26,7 +26,7 @@ def __str__(self):
 
 def trace(binary):
   """Generator for execution trace (instr addresses)"""
-  pasim_cmd = ['pasim', '--debug=0', '--debug-fmt=trace', binary]
+  pasim_cmd = ['pasim', '--debug=0', '--debug-fmt=trace', '-G0', '-m16M', binary]
   # send stdout to /dev/null
   with open(os.devnull, 'w') as fnull:
     pasim = Popen(pasim_cmd, stderr=PIPE, stdout=fnull)
@@ -42,7 +42,7 @@ def trace(binary):
 
 def trace_ex(binary):
   """Generator for extended execution trace in EX stage (instr addresses + PRR before)"""
-  pasim_cmd = ['pasim', '--debug=0', '--debug-fmt=default', binary]
+  pasim_cmd = ['pasim', '--debug=0', '--debug-fmt=long', binary]
   # send stdout to /dev/null
   with open(os.devnull, 'w') as fnull:
     pasim = Popen(pasim_cmd, stderr=PIPE, stdout=fnull)