diff options
| author | Joshua Bakita <jbakita@cs.unc.edu> | 2020-10-16 16:55:14 -0400 |
|---|---|---|
| committer | Joshua Bakita <jbakita@cs.unc.edu> | 2020-10-16 16:55:14 -0400 |
| commit | 6ea9939e0610a809f6f47d13ec68df00d1ca0afc (patch) | |
| tree | fe4a2eee3ddcf77e2367309dcd75a232b76dcd62 /dis | |
| parent | e9285d0cdea756a2830f0ace378e4197b36869aa (diff) | |
Move the DIS benchmarks up a directory and update hardcoded paths
Note that this repo does not attempt to keep a copy of the original
DIS benchmark distributions. UNC real-time has another repo for that.
Diffstat (limited to 'dis')
| -rw-r--r-- | dis/Field/DISstressmarkRNG.h (renamed from dis/original/Field/DISstressmarkRNG.h) | 0 | ||||
| -rw-r--r-- | dis/Field/field.c (renamed from dis/original/Field/field.c) | 0 | ||||
| -rwxr-xr-x | dis/Makefile (renamed from dis/original/Makefile) | 8 | ||||
| -rwxr-xr-x | dis/Matrix/ver1/DISstressmarkRNG.h (renamed from dis/original/Matrix/ver1/DISstressmarkRNG.h) | 0 | ||||
| -rwxr-xr-x | dis/Matrix/ver1/matrix.c (renamed from dis/original/Matrix/ver1/matrix.c) | 0 | ||||
| -rwxr-xr-x | dis/Matrix/ver2/DISstressmarkRNG.h (renamed from dis/original/Matrix/ver2/DISstressmarkRNG.h) | 0 | ||||
| -rwxr-xr-x | dis/Matrix/ver2/matrix.c (renamed from dis/original/Matrix/ver2/matrix.c) | 0 | ||||
| -rw-r--r-- | dis/Neighborhood/DISstressmarkRNG.h (renamed from dis/original/Neighborhood/DISstressmarkRNG.h) | 0 | ||||
| -rw-r--r-- | dis/Neighborhood/neighborhood.c (renamed from dis/original/Neighborhood/neighborhood.c) | 0 | ||||
| -rw-r--r-- | dis/Neighborhood/utili.h (renamed from dis/original/Neighborhood/utili.h) | 0 | ||||
| -rw-r--r-- | dis/Pointer/DISstressmarkRNG.h (renamed from dis/original/Pointer/DISstressmarkRNG.h) | 0 | ||||
| -rw-r--r-- | dis/Pointer/pointer.c (renamed from dis/original/Pointer/pointer.c) | 0 | ||||
| -rw-r--r-- | dis/Transitive/DISstressmarkRNG.h (renamed from dis/original/Transitive/DISstressmarkRNG.h) | 0 | ||||
| -rw-r--r-- | dis/Transitive/transitive.c (renamed from dis/original/Transitive/transitive.c) | 0 | ||||
| -rw-r--r-- | dis/Update/DISstressmarkRNG.h (renamed from dis/original/Update/DISstressmarkRNG.h) | 0 | ||||
| -rw-r--r-- | dis/Update/update.c (renamed from dis/original/Update/update.c) | 0 | ||||
| -rw-r--r-- | dis/WSS_DOCS.md (renamed from dis/original/WSS_DOCS.md) | 0 | ||||
| -rwxr-xr-x | dis/clean.sh (renamed from dis/original/clean.sh) | 0 | ||||
| -rwxr-xr-x | dis/gen_input.py (renamed from dis/original/gen_input.py) | 0 | ||||
| -rw-r--r-- | dis/inputs/Field/in1 (renamed from dis/original/inputs/Field/in1) | 0 | ||||
| -rw-r--r-- | dis/inputs/Field/in2 (renamed from dis/original/inputs/Field/in2) | 0 | ||||
| -rw-r--r-- | dis/inputs/Field/in3 (renamed from dis/original/inputs/Field/in3) | 0 | ||||
| -rw-r--r-- | dis/inputs/Field/in4 (renamed from dis/original/inputs/Field/in4) | 0 | ||||
| -rw-r--r-- | dis/inputs/Field/in5 (renamed from dis/original/inputs/Field/in5) | 0 | ||||
| -rw-r--r-- | dis/inputs/Field/in6 (renamed from dis/original/inputs/Field/in6) | 0 | ||||
| -rw-r--r-- | dis/inputs/Field/in7 (renamed from dis/original/inputs/Field/in7) | 0 | ||||
| -rw-r--r-- | dis/inputs/Matrix/in1 (renamed from dis/original/inputs/Matrix/in1) | 0 | ||||
| -rw-r--r-- | dis/inputs/Matrix/in2 (renamed from dis/original/inputs/Matrix/in2) | 0 | ||||
| -rw-r--r-- | dis/inputs/Matrix/in3 (renamed from dis/original/inputs/Matrix/in3) | 0 | ||||
| -rw-r--r-- | dis/inputs/Matrix/in4 (renamed from dis/original/inputs/Matrix/in4) | 0 | ||||
| -rw-r--r-- | dis/inputs/Matrix/in5 (renamed from dis/original/inputs/Matrix/in5) | 0 | ||||
| -rw-r--r-- | dis/inputs/Matrix/in6 (renamed from dis/original/inputs/Matrix/in6) | 0 | ||||
| -rw-r--r-- | dis/inputs/Matrix/in7 (renamed from dis/original/inputs/Matrix/in7) | 0 | ||||
| -rw-r--r-- | dis/inputs/Neighborhood/in1 (renamed from dis/original/inputs/Neighborhood/in1) | 0 | ||||
| -rw-r--r-- | dis/inputs/Neighborhood/in2 (renamed from dis/original/inputs/Neighborhood/in2) | 0 | ||||
| -rw-r--r-- | dis/inputs/Neighborhood/in3 (renamed from dis/original/inputs/Neighborhood/in3) | 0 | ||||
| -rw-r--r-- | dis/inputs/Neighborhood/in4 (renamed from dis/original/inputs/Neighborhood/in4) | 0 | ||||
| -rw-r--r-- | dis/inputs/Neighborhood/in5 (renamed from dis/original/inputs/Neighborhood/in5) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in1 (renamed from dis/original/inputs/Pointer/in1) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in10 (renamed from dis/original/inputs/Pointer/in10) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in2 (renamed from dis/original/inputs/Pointer/in2) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in3 (renamed from dis/original/inputs/Pointer/in3) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in4 (renamed from dis/original/inputs/Pointer/in4) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in5 (renamed from dis/original/inputs/Pointer/in5) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in6 (renamed from dis/original/inputs/Pointer/in6) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in7 (renamed from dis/original/inputs/Pointer/in7) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in8 (renamed from dis/original/inputs/Pointer/in8) | 0 | ||||
| -rw-r--r-- | dis/inputs/Pointer/in9 (renamed from dis/original/inputs/Pointer/in9) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in1 (renamed from dis/original/inputs/Transitive/in1) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in2 (renamed from dis/original/inputs/Transitive/in2) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in3 (renamed from dis/original/inputs/Transitive/in3) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in4 (renamed from dis/original/inputs/Transitive/in4) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in5 (renamed from dis/original/inputs/Transitive/in5) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in6 (renamed from dis/original/inputs/Transitive/in6) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in7 (renamed from dis/original/inputs/Transitive/in7) | 0 | ||||
| -rw-r--r-- | dis/inputs/Transitive/in8 (renamed from dis/original/inputs/Transitive/in8) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in1 (renamed from dis/original/inputs/Update/in1) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in2 (renamed from dis/original/inputs/Update/in2) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in3 (renamed from dis/original/inputs/Update/in3) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in4 (renamed from dis/original/inputs/Update/in4) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in5 (renamed from dis/original/inputs/Update/in5) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in6 (renamed from dis/original/inputs/Update/in6) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in7 (renamed from dis/original/inputs/Update/in7) | 0 | ||||
| -rw-r--r-- | dis/inputs/Update/in8 (renamed from dis/original/inputs/Update/in8) | 0 | ||||
| -rw-r--r-- | dis/inputs/WSSS (renamed from dis/original/inputs/WSSS) | 0 | ||||
| -rw-r--r-- | dis/inputs/WSSS_maxstride4mb (renamed from dis/original/inputs/WSSS_maxstride4mb) | 0 | ||||
| -rw-r--r-- | dis/inputs/caches (renamed from dis/original/inputs/caches) | 0 | ||||
| -rw-r--r-- | dis/inputs/caches_maxstride2ways (renamed from dis/original/inputs/caches_maxstride2ways) | 0 | ||||
| -rw-r--r-- | dis/inputs/random_walk/in1 (renamed from dis/original/inputs/random_walk/in1) | 0 | ||||
| -rwxr-xr-x | dis/postproc.sh (renamed from dis/original/postproc.sh) | 0 | ||||
| -rw-r--r-- | dis/random_walk.c (renamed from dis/original/random_walk.c) | 0 | ||||
| -rwxr-xr-x | dis/runDIS1.sh (renamed from dis/original/runDIS1.sh) | 0 | ||||
| -rwxr-xr-x | dis/runDIS2.sh (renamed from dis/original/runDIS2.sh) | 0 | ||||
| -rwxr-xr-x | dis/runDIS4.sh (renamed from dis/original/runDIS4.sh) | 0 | ||||
| -rwxr-xr-x | dis/run_dis.sh (renamed from dis/original/run_dis.sh) | 0 | ||||
| -rwxr-xr-x | dis/setup_mem_and_global.sh (renamed from dis/original/setup_mem_and_global.sh) | 0 | ||||
| -rwxr-xr-x | dis/summarize.py (renamed from dis/original/summarize.py) | 0 |
77 files changed, 4 insertions, 4 deletions
diff --git a/dis/original/Field/DISstressmarkRNG.h b/dis/Field/DISstressmarkRNG.h index 4aa2620..4aa2620 100644 --- a/dis/original/Field/DISstressmarkRNG.h +++ b/dis/Field/DISstressmarkRNG.h | |||
diff --git a/dis/original/Field/field.c b/dis/Field/field.c index 8565e8c..8565e8c 100644 --- a/dis/original/Field/field.c +++ b/dis/Field/field.c | |||
diff --git a/dis/original/Makefile b/dis/Makefile index 9f7286d..7f3da39 100755 --- a/dis/original/Makefile +++ b/dis/Makefile | |||
| @@ -1,16 +1,16 @@ | |||
| 1 | LIBLITMUS ?= /media/speedy/litmus/liblitmus | 1 | LIBLITMUS ?= /media/speedy/litmus/liblitmus |
| 2 | CC ?= gcc | 2 | CC ?= gcc |
| 3 | override CFLAGS += -pthread -O2 -ggdb3 -I../../baseline/source | 3 | override CFLAGS += -pthread -O2 -ggdb3 -I../baseline/source |
| 4 | LDFLAGS = -lrt -lm | 4 | LDFLAGS = -lrt -lm |
| 5 | COMMON = ../../baseline/source/extra.h | 5 | COMMON = ../baseline/source/extra.h |
| 6 | 6 | ||
| 7 | # Handle cases where we're also profiling with the MMDC on the i.MX6Q | 7 | # Handle cases where we're also profiling with the MMDC on the i.MX6Q |
| 8 | ifneq ($(shell grep "define MMDC 1" ../../baseline/source/extra.h),) | 8 | ifneq ($(shell grep "define MMDC 1" ../baseline/source/extra.h),) |
| 9 | COMMON += /media/speedy/litmus/tools/mmdc/mmdc.c | 9 | COMMON += /media/speedy/litmus/tools/mmdc/mmdc.c |
| 10 | endif | 10 | endif |
| 11 | 11 | ||
| 12 | # Include all the LITMUS^RT headers if we're using it | 12 | # Include all the LITMUS^RT headers if we're using it |
| 13 | ifneq ($(shell grep "define LITMUS 1" ../../baseline/source/extra.h),) | 13 | ifneq ($(shell grep "define LITMUS 1" ../baseline/source/extra.h),) |
| 14 | CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include | 14 | CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include |
| 15 | LDFLAGS += -L${LIBLITMUS} -llitmus | 15 | LDFLAGS += -L${LIBLITMUS} -llitmus |
| 16 | endif | 16 | endif |
diff --git a/dis/original/Matrix/ver1/DISstressmarkRNG.h b/dis/Matrix/ver1/DISstressmarkRNG.h index 4aa2620..4aa2620 100755 --- a/dis/original/Matrix/ver1/DISstressmarkRNG.h +++ b/dis/Matrix/ver1/DISstressmarkRNG.h | |||
diff --git a/dis/original/Matrix/ver1/matrix.c b/dis/Matrix/ver1/matrix.c index 518a638..518a638 100755 --- a/dis/original/Matrix/ver1/matrix.c +++ b/dis/Matrix/ver1/matrix.c | |||
diff --git a/dis/original/Matrix/ver2/DISstressmarkRNG.h b/dis/Matrix/ver2/DISstressmarkRNG.h index 4aa2620..4aa2620 100755 --- a/dis/original/Matrix/ver2/DISstressmarkRNG.h +++ b/dis/Matrix/ver2/DISstressmarkRNG.h | |||
diff --git a/dis/original/Matrix/ver2/matrix.c b/dis/Matrix/ver2/matrix.c index 957d7c5..957d7c5 100755 --- a/dis/original/Matrix/ver2/matrix.c +++ b/dis/Matrix/ver2/matrix.c | |||
diff --git a/dis/original/Neighborhood/DISstressmarkRNG.h b/dis/Neighborhood/DISstressmarkRNG.h index 4aa2620..4aa2620 100644 --- a/dis/original/Neighborhood/DISstressmarkRNG.h +++ b/dis/Neighborhood/DISstressmarkRNG.h | |||
diff --git a/dis/original/Neighborhood/neighborhood.c b/dis/Neighborhood/neighborhood.c index 1736d38..1736d38 100644 --- a/dis/original/Neighborhood/neighborhood.c +++ b/dis/Neighborhood/neighborhood.c | |||
diff --git a/dis/original/Neighborhood/utili.h b/dis/Neighborhood/utili.h index 2a8e2a0..2a8e2a0 100644 --- a/dis/original/Neighborhood/utili.h +++ b/dis/Neighborhood/utili.h | |||
diff --git a/dis/original/Pointer/DISstressmarkRNG.h b/dis/Pointer/DISstressmarkRNG.h index 4aa2620..4aa2620 100644 --- a/dis/original/Pointer/DISstressmarkRNG.h +++ b/dis/Pointer/DISstressmarkRNG.h | |||
diff --git a/dis/original/Pointer/pointer.c b/dis/Pointer/pointer.c index 5671697..5671697 100644 --- a/dis/original/Pointer/pointer.c +++ b/dis/Pointer/pointer.c | |||
diff --git a/dis/original/Transitive/DISstressmarkRNG.h b/dis/Transitive/DISstressmarkRNG.h index 4aa2620..4aa2620 100644 --- a/dis/original/Transitive/DISstressmarkRNG.h +++ b/dis/Transitive/DISstressmarkRNG.h | |||
diff --git a/dis/original/Transitive/transitive.c b/dis/Transitive/transitive.c index 5fa52e8..5fa52e8 100644 --- a/dis/original/Transitive/transitive.c +++ b/dis/Transitive/transitive.c | |||
diff --git a/dis/original/Update/DISstressmarkRNG.h b/dis/Update/DISstressmarkRNG.h index 4aa2620..4aa2620 100644 --- a/dis/original/Update/DISstressmarkRNG.h +++ b/dis/Update/DISstressmarkRNG.h | |||
diff --git a/dis/original/Update/update.c b/dis/Update/update.c index 1fd8197..1fd8197 100644 --- a/dis/original/Update/update.c +++ b/dis/Update/update.c | |||
diff --git a/dis/original/WSS_DOCS.md b/dis/WSS_DOCS.md index da5e066..da5e066 100644 --- a/dis/original/WSS_DOCS.md +++ b/dis/WSS_DOCS.md | |||
diff --git a/dis/original/clean.sh b/dis/clean.sh index 7c58295..7c58295 100755 --- a/dis/original/clean.sh +++ b/dis/clean.sh | |||
diff --git a/dis/original/gen_input.py b/dis/gen_input.py index c7821b0..c7821b0 100755 --- a/dis/original/gen_input.py +++ b/dis/gen_input.py | |||
diff --git a/dis/original/inputs/Field/in1 b/dis/inputs/Field/in1 index 1b87830..1b87830 100644 --- a/dis/original/inputs/Field/in1 +++ b/dis/inputs/Field/in1 | |||
diff --git a/dis/original/inputs/Field/in2 b/dis/inputs/Field/in2 index 2185e20..2185e20 100644 --- a/dis/original/inputs/Field/in2 +++ b/dis/inputs/Field/in2 | |||
diff --git a/dis/original/inputs/Field/in3 b/dis/inputs/Field/in3 index 15608d2..15608d2 100644 --- a/dis/original/inputs/Field/in3 +++ b/ | |||