From 6ea9939e0610a809f6f47d13ec68df00d1ca0afc Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Fri, 16 Oct 2020 16:55:14 -0400 Subject: 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. --- dis/original/Transitive/DISstressmarkRNG.h | 190 ----------------------------- dis/original/Transitive/transitive.c | 131 -------------------- 2 files changed, 321 deletions(-) delete mode 100644 dis/original/Transitive/DISstressmarkRNG.h delete mode 100644 dis/original/Transitive/transitive.c (limited to 'dis/original/Transitive') diff --git a/dis/original/Transitive/DISstressmarkRNG.h b/dis/original/Transitive/DISstressmarkRNG.h deleted file mode 100644 index 4aa2620..0000000 --- a/dis/original/Transitive/DISstressmarkRNG.h +++ /dev/null @@ -1,190 +0,0 @@ -#include - -#define IA 16807 -#define IM 2147483647 -#define AM (1.0/IM) -#define IQ 127773 -#define IR 2836 -#define NTAB 32 -#define NDIV (1+(IM-1)/NTAB) -#define EPS 1.2e-7 -#define RNMX (1.0-EPS) - -static long iy=0; -static long iv[NTAB]; -static long iseed; - -int ABS(int x){ - if (x>= 0) return x; - else - return (-x); -} - -int sign(int x){ - if (x >= 0) return 1; - else - return (-1); -} - -int MAX(int x, int y){ - if (x>= y) return x; - else - return y; -} - -int MIN(int x, int y){ - if (x<= y) return x; - else - return y; -} - -void randInit(long idum) -{ - long j; - long k; - - assert (idum <= 0); - assert (iy == 0); - - iseed = idum; - if (-(iseed)<1){ - iseed = 1; - } - else { - iseed = -(iseed); - } - for (j=NTAB+7; j>=0; j--){ - k = (iseed)/IQ; - iseed = IA*(iseed-k*IQ)-IR*k; - if (iseed < 0){ - iseed += IM; - } - if (j < NTAB){ - iv[j] = iseed; - } - } - iy = iv[0]; -} - -float randNum() -{ - long j; - long k; - float temp; - - assert (iy != 0); - - k = (iseed)/IQ; - iseed = IA*(iseed-k*IQ)-IR*k; - - if (iseed < 0){ - iseed += IM; - } - j = iy/NDIV; - iy = iv[j]; - iv[j] = iseed; - - temp = AM * iy; - - if (temp > RNMX){ - return RNMX; - } - else { - return temp; - } -} - - -float randomFloat(float lowest_float, float highest_float) -{ - float value; - float range; - -assert (lowest_float < highest_float); - -range = highest_float - lowest_float; -value = randNum()*(highest_float - lowest_float) + lowest_float; -assert(value >= lowest_float); -assert(value <= highest_float); - -return value; - -} - -float randomNonZeroFloat(float lowest_float, float highest_float, float epsilon) -{ - - double range; - float value; - - - assert (lowest_float < 0); - assert (highest_float > 0); - assert (epsilon > 0); - assert ((epsilon < -lowest_float) && (epsilon < highest_float)); - - range = highest_float - lowest_float; - value = (randNum() * range)+lowest_float; - - if (ABS(value) < epsilon) - { - if (value > 0) value = value + epsilon; - else if (value < 0) value = value - epsilon; - - } - - assert (value >= lowest_float); - assert (value <= highest_float); - - return value; -} - -unsigned int randomUInt(int lowest_uint, int highest_uint) -{ - float range; - unsigned int value; - float temp; - - range =(float)(highest_uint - lowest_uint + 1); - temp = randNum(); - value =(unsigned int)( floor(temp * range) + lowest_uint); - - assert (value >= lowest_uint); - assert (value <= highest_uint); - - return value; -} - -unsigned int randomNonZeroUInt(int lowest_uint, int highest_uint) -{ - float range; - unsigned int value; - float temp; - - range =(float)(highest_uint - lowest_uint + 1); - value = 0; - while(value == 0){ - temp = randNum(); - - value =(unsigned int)( floor(temp * range) + lowest_uint); - } - - assert (value >= lowest_uint); - assert (value <= highest_uint); - - return value; -} - -int randInt(int lowest_uint, int highest_uint) -{ - float range; - int value; - - range = highest_uint - lowest_uint + 1; - value = (int)(floor(randNum() * range) + lowest_uint); - - assert (value >= lowest_uint); - assert (value <= highest_uint); - - return value; -} diff --git a/dis/original/Transitive/transitive.c b/dis/original/Transitive/transitive.c deleted file mode 100644 index 5fa52e8..0000000 --- a/dis/original/Transitive/transitive.c +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Sample code for the DIS Transitive Stressmark - * - * This source code is the completely correct source code based on - * the example codes provided by Atlantic Aerospace Division, Titan - * Systems Corporation, 2000. - * - * If you just compile and generate the executables from this source - * code, this code would be enough. However, if you wish to get a complete - * understanding of this stressmark, it is strongly suggested that you - * read the Benchmark Analysis and Specifications Document Version 1.0 - * before going on since the detailed comments are given in this documents. - * the comments are not repeated here. - * - * CHANGELOG: - * Joshua Bakita, 05/30/2020: Fixed out-of-bounds randInt call - */ - -#include -#include -#include -#include -#include "DISstressmarkRNG.h" -#include "extra.h" - -#define MIN_VERTICES 8 -#define MAX_VERTICES 16384 -#define MIN_EDGES 0 -#define MAX_EDGES 268435456 -#define MIN_SEED -2147483647 -#define MAX_SEED -1 -#define NO_PATH 2147483647 - -#define MIN_EDGS 0 -#define MAX_EDGE 255 - -/* - * main() - */ - -int main(int argc, char** argv){ - unsigned int *din, *dout; - unsigned int n; - unsigned int m; - unsigned int i, j, k; - int seed; - - time_t startTime; - unsigned int sum; - - fscanf(stdin,"%d %d %d", &n, &m, &seed); - - assert((n >= MIN_VERTICES) && (n <= MAX_VERTICES)); - assert((m >= MIN_EDGES) && (m <= MAX_EDGES)); - assert (m <= n*n); - assert ((seed >= MIN_SEED) && (seed <= MAX_SEED)); - - if ((din = (unsigned int *)malloc(n*n*sizeof(unsigned int))) == NULL) - return (-1); - if ((dout = (unsigned int *)malloc(n*n*sizeof(unsigned int))) == NULL) - return (-1); - - for (i=0; i