From e9285d0cdea756a2830f0ace378e4197b36869aa Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Fri, 12 Jun 2020 01:44:56 +0000 Subject: Add initial instrumentation to and fix warnings in DIS stressmarks Changes: - Backpoint fix to randInt range - Instrument benchmarks with time tracking - assert inputs are correct length to fix compiler warnings Problems: - Timing on a per-loop basis is non representative of real-world workloads, as we clear the cache after every loop. These all need to be re-instrumented to record times for the whole benchmark, rather than per-loop. --- dis/original/Field/field.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'dis/original/Field/field.c') diff --git a/dis/original/Field/field.c b/dis/original/Field/field.c index a561f72..8565e8c 100644 --- a/dis/original/Field/field.c +++ b/dis/original/Field/field.c @@ -22,7 +22,7 @@ #define MIN_FIELD_SIZE 16 -#define MAX_FIELD_SIZE 16777216 +#define MAX_FIELD_SIZE (16777216*4) // This has been quadrupled from original #define MIN_SEED -2147483647 #define MAX_SEED -1 #define MIN_MOD_OFFSET 0 @@ -62,7 +62,7 @@ int main(int argc, char** argv){ unsigned int l; - fscanf(stdin, "%d %d %d %d", &f, &seed, &mod_offset, &n); + assert(fscanf(stdin, "%d %d %d %d", &f, &seed, &mod_offset, &n) == 4); assert((f >= MIN_FIELD_SIZE) && (f <= MAX_FIELD_SIZE)); assert((seed >= MIN_SEED) && (seed <= MAX_SEED)); @@ -72,12 +72,12 @@ int main(int argc, char** argv){ int x; int index; index = 0; - fscanf(stdin,"%x", &x); + assert(fscanf(stdin,"%x", &x) == 1); while(x!=0){ assert((x >= MIN_TOKEN_VALUE) && (x <= MAX_TOKEN_VALUE)); token[l].delimiter[index] = (unsigned char )x; index++; - fscanf(stdin,"%x", &x); + assert(fscanf(stdin,"%x", &x) == 1); } assert((index >= MIN_TOKEN_LENGTH) && (index <= MAX_TOKEN_LENGTH)); token[l].length = index; @@ -132,6 +132,7 @@ int main(int argc, char** argv){ } index++; } + token[l].subfields++; STOP_LOOP } -- cgit v1.2.2