25 files changed, 23 insertions, 453 deletions

diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c
index 04a5746..368e98d 100644
--- a/baseline/source/adpcm_dec/adpcm_dec.c
+++ b/baseline/source/adpcm_dec/adpcm_dec.c
@@ -35,7 +35,7 @@
   Forward declaration of functions
 */
 
-#include "../extra.h"
+#include "extra.h"
 
 void adpcm_dec_decode( int );
 int adpcm_dec_filtez( int *bpl, int *dlt );
diff --git a/baseline/source/adpcm_enc/adpcm_enc.c b/baseline/source/adpcm_enc/adpcm_enc.c
index 464768f..777aaf5 100644
--- a/baseline/source/adpcm_enc/adpcm_enc.c
+++ b/baseline/source/adpcm_enc/adpcm_enc.c
@@ -29,7 +29,7 @@
 
 /* common sampling rate for sound cards on IBM/PC */
 
-#include "../extra.h"
+#include "extra.h"
 #define SAMPLE_RATE 11025
 
 #define PI 3141
diff --git a/baseline/source/ammunition/ammunition.c b/baseline/source/ammunition/ammunition.c
index 269f4c0..052520e 100644
--- a/baseline/source/ammunition/ammunition.c
+++ b/baseline/source/ammunition/ammunition.c
@@ -24,7 +24,7 @@
 
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "bits.h"
 #include "arithm.h"
 #include "ammunition_stdlib.h"
diff --git a/baseline/source/anagram/anagram.c b/baseline/source/anagram/anagram.c
index b458fd2..5c1f29a 100644
--- a/baseline/source/anagram/anagram.c
+++ b/baseline/source/anagram/anagram.c
@@ -157,7 +157,7 @@
    steps to FindAnagram.
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "anagram_ctype.h"
 #include "anagram_stdlib.h"
 #include "anagram_strings.h"
diff --git a/baseline/source/audiobeam/audiobeam.c b/baseline/source/audiobeam/audiobeam.c
index 208de80..50ebfff 100644
--- a/baseline/source/audiobeam/audiobeam.c
+++ b/baseline/source/audiobeam/audiobeam.c
@@ -23,7 +23,7 @@
   Include section
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "audiobeamlibm.h"
 #include "audiobeamlibmalloc.h"
 #include "audiobeam.h"
diff --git a/baseline/source/cjpeg_transupp/cjpeg_transupp.c b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
index 3f48539..5ec7e5e 100644
--- a/baseline/source/cjpeg_transupp/cjpeg_transupp.c
+++ b/baseline/source/cjpeg_transupp/cjpeg_transupp.c
@@ -29,7 +29,7 @@
   Include section
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "jpeglib.h"
 
 
diff --git a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
index 278725c..3c8d7ec 100644
--- a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
+++ b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c
@@ -24,7 +24,7 @@
 
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "cdjpeg.h"
 
 #ifdef CJPEG_WRBMP_BMP_SUPPORTED
diff --git a/baseline/source/dijkstra/dijkstra.c b/baseline/source/dijkstra/dijkstra.c
index 1b6a52f..333fd43 100644
--- a/baseline/source/dijkstra/dijkstra.c
+++ b/baseline/source/dijkstra/dijkstra.c
@@ -17,7 +17,7 @@
 
 */
 
-#include "../extra.h"
+#include "extra.h"
 #include "input.h"
 
 /*
diff --git a/baseline/source/epic/epic.c b/baseline/source/epic/epic.c
index e258a4a..a1e344c 100644
--- a/baseline/source/epic/epic.c
+++ b/baseline/source/epic/epic.c
@@ -35,7 +35,7 @@
 */
 
 
-#include "../extra.h"
+#include "extra.h"
 #include "epic.h"
 
 #define X_SIZE  64
diff --git a/baseline/source/extra.h b/baseline/source/extra.h
deleted file mode 100644
index e8f3d18..0000000
--- a/baseline/source/extra.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/**
- * Copyright 2019 Sims Hill Osborne and Joshua Bakita
- *
- * This header provides facilities by which to separably run and time TACLeBench
- **/
-#define _GNU_SOURCE
-#include <time.h>
-#include <sys/mman.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <stdint.h>
-#include <sched.h>
-
-// This is only visible if _GNU_SOURCE is defined, and that define does not
-// come along to places where this file is included. Address this by manually
-// forcing it into the global namespace.
-extern int sched_getcpu();
-
-// These constants correspond to the imx6q-sabredb platform
-#define LINE_SIZE 32
-#define L2_SIZE 16*2048*32
-
-#if __arm__
-#include <unistd.h>
-#include <sys/syscall.h>
-#endif
-
-#define LITMUS 0
-#define MC2 0
-#define MMDC_PROF 0
-
-#if LITMUS
-#include <litmus.h>
-#endif
-
-#if MMDC_PROF
-#include  "/media/speedy/litmus/tools/mmdc/mmdc.h"
-#endif
-
-#if LITMUS
-#define SET_UP LOAD_PARAMS SETUP_LITMUS
-#else
-#define SET_UP LOAD_PARAMS
-#endif
-
-#if MMDC_PROF