add comments - change specrand.c to .cpp

Author: amin1377

CMakeLists.txt

@@ -304,7 +304,7 @@ endif()
 #
 set(SPEC_CPU_FLAGS "")
 if(SPEC_CPU)
-    #Enable gcov
+    # Enable SPEC CPU flag - Maximizes portability of code and minimizing the variation in how much work we do on different platforms
     set(SPEC_CPU_FLAGS "-DSPEC_CPU")
     message(STATUS "SPEC CPU FLAGS: ${SPEC_CPU_FLAGS}")
 endif()

libs/libvtrutil/CMakeLists.txt

@@ -83,7 +83,7 @@ add_custom_command(OUTPUT ${VTR_VERSION_FILE_OUT}
 #
 # Source files and library
 #
-file(GLOB_RECURSE LIB_SOURCES src/*.cpp src/*.c)
+file(GLOB_RECURSE LIB_SOURCES src/*.cpp)
 file(GLOB_RECURSE LIB_HEADERS src/*.hpp src/*.h)
 files_to_dirs(LIB_HEADERS LIB_INCLUDE_DIRS)
 

libs/libvtrutil/src/specrand.c renamed to libs/libvtrutil/src/specrand.cpp

@@ -1,4 +1,9 @@
-/* 
+/*
+ * * For inclusion in the SPEC cpu benchmarks
+* This file implements the random number generation necessary for the SPEC cpu benchmarks. The functions
+* defined here are used in vtr_random.h/cpp
+
+
    A C-program for MT19937, with initialization improved 2002/1/26.
    Coded by Takuji Nishimura and Makoto Matsumoto.
 
@@ -45,15 +50,8 @@
 /* Slightly modified for use in SPEC CPU by Cloyce D. Spradling (5 Nov 2009)
  */
 
-#include <stdio.h>
 #include "specrand.h"
 
-#ifdef __cplusplus
-# define CLINK extern "C"
-#else
-# define CLINK
-#endif
-
 /* Period parameters */  
 #define N 624
 #define M 397
@@ -64,22 +62,22 @@
 static unsigned long mt[N]; /* the array for the state vector  */
 static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
 
-CLINK void spec_srand(int seed) {
+void spec_srand(int seed) {
   spec_init_genrand((unsigned long) seed);
 }
 
 /* Just a copy of spec_genrand_real2() */
-CLINK double spec_rand(void) {
+double spec_rand() {
     return spec_genrand_int32()*(1.0/4294967296.0); 
 }
 
 /* Just a copy of spec_genrand_int31() */
-CLINK long spec_lrand48(void) {
+long spec_lrand48() {
     return (long)(spec_genrand_int32()>>1);
 }
 
 /* initializes mt[N] with a seed */
-CLINK void spec_init_genrand(unsigned long s)
+void spec_init_genrand(unsigned long s)
 {
     mt[0]= s & 0xffffffffUL;
     for (mti=1; mti<N; mti++) {
@@ -98,7 +96,7 @@ CLINK void spec_init_genrand(unsigned long s)
 /* init_key is the array for initializing keys */
 /* key_length is its length */
 /* slight change for C++, 2004/2/26 */
-CLINK void spec_init_by_array(unsigned long init_key[], int key_length)
+void spec_init_by_array(unsigned long init_key[], int key_length)
 {
     int i, j, k;
     spec_init_genrand(19650218UL);
@@ -124,7 +122,7 @@ CLINK void spec_init_by_array(unsigned long init_key[], int key_length)
 }
 
 /* generates a random number on [0,0xffffffff]-interval */
-CLINK unsigned long spec_genrand_int32(void)
+unsigned long spec_genrand_int32()
 {
     unsigned long y;
     static unsigned long mag01[2]={0x0UL, MATRIX_A};
@@ -162,34 +160,34 @@ CLINK unsigned long spec_genrand_int32(void)
 }
 
 /* generates a random number on [0,0x7fffffff]-interval */
-CLINK long spec_genrand_int31(void)
+long spec_genrand_int31()
 {
     return (long)(spec_genrand_int32()>>1);
 }
 
 /* generates a random number on [0,1]-real-interval */
-CLINK double spec_genrand_real1(void)
+double spec_genrand_real1()
 {
     return spec_genrand_int32()*(1.0/4294967295.0); 
     /* divided by 2^32-1 */ 
 }
 
 /* generates a random number on [0,1)-real-interval */
-CLINK double spec_genrand_real2(void)
+double spec_genrand_real2()
 {
     return spec_genrand_int32()*(1.0/4294967296.0); 
     /* divided by 2^32 */
 }
 
 /* generates a random number on (0,1)-real-interval */
-CLINK double spec_genrand_real3(void)
+double spec_genrand_real3()
 {
     return (((double)spec_genrand_int32()) + 0.5)*(1.0/4294967296.0); 
     /* divided by 2^32 */
 }
 
 /* generates a random number on [0,1) with 53-bit resolution*/
-CLINK double spec_genrand_res53(void) 
+double spec_genrand_res53()
 { 
     unsigned long a=spec_genrand_int32()>>5, b=spec_genrand_int32()>>6; 
     return(a*67108864.0+b)*(1.0/9007199254740992.0); 

libs/libvtrutil/src/specrand.h

@@ -1,4 +1,11 @@
-/* 
+#ifndef VPR_SPEC_RAND_H
+#define VPR_SPEC_RAND_H
+/*
+ * For inclusion in the SPEC cpu benchmarks
+ * This file implements the random number generation necessary for the SPEC cpu benchmarks. The functions
+ * defined here are used in vtr_random.h/cpp
+ *
+ *
  * A C-program for MT19937, with initialization improved 2002/1/26.
  * Coded by Takuji Nishimura and Makoto Matsumoto.
  *
@@ -45,13 +52,9 @@
 /* Slightly modified for use in SPEC CPU by Cloyce D. Spradling (5 Nov 2009)
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 void spec_srand(int seed);
-double spec_rand(void);
-long spec_lrand48(void);
+double spec_rand();
+long spec_lrand48();
 
 /* initializes mt[N] with a seed */
 void spec_init_genrand(unsigned long s);
@@ -63,23 +66,21 @@ void spec_init_genrand(unsigned long s);
 void spec_init_by_array(unsigned long init_key[], int key_length);
 
 /* generates a random number on [0,0xffffffff]-interval */
-unsigned long spec_genrand_int32(void);
+unsigned long spec_genrand_int32();
 
 /* generates a random number on [0,0x7fffffff]-interval */
-long spec_genrand_int31(void);
+long spec_genrand_int31();
 
 /* generates a random number on [0,1]-real-interval */
-double spec_genrand_real1(void);
+double spec_genrand_real1();
 
 /* generates a random number on [0,1)-real-interval */
-double spec_genrand_real2(void);
+double spec_genrand_real2();
 
 /* generates a random number on (0,1)-real-interval */
-double spec_genrand_real3(void);
+double spec_genrand_real3();
 
 /* generates a random number on [0,1) with 53-bit resolution*/
-double spec_genrand_res53(void);
+double spec_genrand_res53();
 
-#ifdef __cplusplus
-}
 #endif