wip

6 files changed, 16 insertions, 518 deletions

diff --git a/.gitignore b/.gitignore
index 0e0db96..b7e90f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,15 +26,19 @@
 **/adpcm_dec
 **/adpcm_enc
 **/ammunition
+**/anagram
+**/audiobeam
 **/cjpeg_transupp
 **/cjpeg_wrbmp
 **/dijkstra
 **/epic
 **/fmref
+**/g723_enc
 **/gsm_dec
 **/gsm_enc
 **/h264_dec
 **/huff_enc
+**/huff_dec
 **/mpeg2
 **/ndes
 **/petrinet
diff --git a/SD-VBS/common/c/extra.h b/SD-VBS/common/c/extra.h
deleted file mode 100644
index 9c72064..0000000
--- a/SD-VBS/common/c/extra.h
+++ /dev/null
@@ -1,508 +0,0 @@
-/**
- * Copyright 2019 Sims Hill Osborne and 2020 Joshua Bakita
- *
- * This header provides facilities by which to separably run and time TACLeBench
- * To use this for paired task timing, define PAIRED (pass CFLAGS=-DPAIRED to make)
- **/
-#define _GNU_SOURCE
-#include <fcntl.h>     // For O_CREAT and O_RDWR
-#include <sched.h>     // For sched_yield()
-#include <semaphore.h> // For sem_{open, post, wait}()
-#include <stdio.h>
-#include <stdlib.h>    // For exit()
-#include <string.h>    // For strlen()
-#include <sys/mman.h>  // For mlockall()
-#include <unistd.h>    // For ftruncate()
-#include <time.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
-
-// This is a proxy for "case study mode" now
-#define LITMUS 1
-#define MMDC_PROF 0
-
-#if LITMUS
-#include <litmus.h>
-#endif
-
-#if MMDC_PROF
-#include  "/media/speedy/litmus/tools/mmdc/mmdc.h"
-#endif
-
-// Store state globally so that the job can be outside main()
-// Arrays use float as a comprimise between overflow and size
-// Paired arrays use long longs as precision is more important for those times
-#ifdef PAIRED
-long long *_rt_start_time;
-long long *_rt_end_time;
-#else
-float *_rt_exec_time;
-#endif
-#if MMDC_PERF
-float *_rt_mmdc_read;
-float *_rt_mmdc_write;
-#endif
-long _rt_jobs_complete;
-long _rt_max_jobs;
-int _rt_core;
-int _rt_will_output;
-struct timespec _rt_start, _rt_end;
-
-char *_rt_run_id;
-char *_rt_our_prog_name;
-char *_rt_other_prog_name;
-char *_rt_other_core;
-#define _RT_FILENAME_LEN 64
-#define _BILLION (1000*1000*1000)
-#ifdef PAIRED
-char *_rt_barrier;
-sem_t *_rt_first_sem, *_rt_second_sem;
-int _rt_lock_id;
-#define _ID_SZ 128
-char _rt_sem1_name[_ID_SZ] = "/_libextra_first_sem-";
-char _rt_sem2_name[_ID_SZ] = "/_libextra_second_sem-";
-char _rt_shm_name[_ID_SZ] = "/_libextra_barrier-";
-#endif /* PAIRED */
-
-#if LITMUS
-long unsigned int _rt_period;
-#endif
-
-static void _rt_load_params_itrl(int argc, char **argv) {
-#ifdef PAIRED
-    if (argc != (8 + LITMUS*2) && argc != (9 + LITMUS*2)) {
-        fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?>", argv[0]);
-#else
-    if (argc != (6 + LITMUS*2)) {
-        fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);
-#endif /* PAIRED */
-        fprintf(stderr, " <name> string for logging. Name of this task.\n");
-        fprintf(stderr, " <loops> integer number of iterations. -1 for infinite.\n");
-        fprintf(stderr, " <my core> integer core number. Only used for LITMUS-RT.\n");
-#ifdef PAIRED
-        fprintf(stderr, " <other core> integer for logging. Core of paired task.\n");
-        fprintf(stderr, " <other name> string for logging. Name of paired task.\n");
-#endif /* PAIRED */
-        fprintf(stderr, " <runID> string to append with .txt to yield output file name.\n");
-        fprintf(stderr, " <save results?> 1 to save results, 0 to discard.\n");
-#ifdef PAIRED
-        fprintf(stderr, " <pairID> (optional).\n");
-#endif
-#if LITMUS
-        fprintf(stderr, " <task period> in ms\n");
-        fprintf(stderr, " <task criticality level> 0 for Level-A, 1 for Level-B, 2 for Level-C\n");
-#endif /* LITMUS */
-        exit(1);
-    }
-    _rt_our_prog_name = argv[1];
-    _rt_max_jobs = atol(argv[2]);
-#if !LITMUS
-    _rt_core = sched_getcpu();
-#else
-    _rt_core = atoi(argv[3]);
-#endif
-#ifdef PAIRED
-    _rt_other_core = argv[4];
-    _rt_other_prog_name = argv[5];
-    _rt_run_id = argv[6];
-    _rt_will_output = atoi(argv[7]);
-    char *pairId;
-    int end;
-    if (argc > 8) {
-        pairId = argv[8];
-        end = 8;
-    } else {
-        pairId = "none";
-        end = 9;
-    }
-#else
-    _rt_other_core = "none";
-    _rt_other_prog_name = "none";
-    _rt_run_id = argv[4];
-    _rt_will_output = atoi(argv[5]);
-    int end = 6;
-#endif /* PAIRED */
-    if (_rt_max_jobs < 0 && _rt_will_output != 0) {
-        fprintf(stderr, "Infinite loops only supported when output is disabled!\n");
-        exit(1);
-    }
-    if (strlen(_rt_run_id) + 5 > _RT_FILENAME_LEN) {
-        fprintf(stderr, "Run ID is too large! Keep it to less than %d characters.\n", _RT_FILENAME_LEN);
-        exit(1);
-    }
-#ifdef PAIRED
-    // __rt_sem2_name happens to be the longest
-    if (strlen(pairId) + strlen(_rt_sem2_name) > _ID_SZ) {
-        fprintf(stderr, "PairID is too long! Maximum length is %ld characters.\n", _ID_SZ - strlen(_rt_sem2_name));
-        exit(1);
-    }
-    _rt_start_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
-    _rt_end_time = calloc(_rt_max_jobs * _rt_will_output, sizeof(long long));
-    if (!_rt_end_time || !_rt_start_time) {
-        perror("Unable to allocate buffers for execution times");
-        exit(1);
-    }
-    // Use PairID to create unique semaphore and shared memory paths
-    strcat(_rt_sem1_name, pairId);
-    strcat(_rt_sem2_name, pairId);
-    strcat(_rt_shm_name, pairId);
-    _rt_first_sem = sem_open(_rt_sem1_name, O_CREAT, 644, 0);
-    _rt_second_sem = sem_open(_rt_sem2_name, O_CREAT, 644, 0);
-    if (_rt_first_sem == SEM_FAILED || _rt_second_sem == SEM_FAILED) {
-        perror("Error while creating semaphores");
-        exit(1);
-    }
-    // Create shared memory for barrier synchronization and infer lock ID
-    int barrier_file = shm_open(_rt_shm_name, O_CREAT | O_RDWR | O_EXCL, 644);
-    if (barrier_file == -1) {
-        // File already existed - we're the 2nd program and thus lock ID 2
-        _rt_lock_id = 2;
-        barrier_file = shm_open(_rt_shm_name, O_CREAT | O_RDWR, 644);
-    } else {