Merge pull request #3 from yohanchatelain/master

Pre-release:

Makefile

@@ -1,6 +1,6 @@
 # Makefile for the instrumented shared library
 
-CC = verificarlo-c --save-temps --verbose
+CC = verificarlo-c --save-temps --verbose -g
 TRACER_FLAGS = --tracer --tracer-debug-mode --tracer-level=temporary
 CFLAGS = -fPIC --verbose  # C flags
 LDFLAGS = -shared   # linking flags

README.md

@@ -14,11 +14,12 @@ across the operating systems.
 git clone https://github.com/big-data-lab-team/MCA-libmath.git /tmp/mca-libmath/
 cd /tmp/mca-libmath/src/
 make
+make test
 ```
 
 3) Export Linux `LD_PRELOAD` environment variable by running:
 ```
-export LD_PRELOAD=/tmp/mca-libmath/src/libpreload.so
+export LD_PRELOAD=/tmp/mca-libmath/src/libmath.so
 ```
 
 4) Set the virtual precision and instrumentation mode of Verificarlo by running:

src/wrapping_script.c

@@ -75,7 +75,7 @@ static float (*real_erfcf)(float dbl);
 static double (*real_lgamma)(double dbl);
 static float (*real_lgammaf)(float dbl);
 static double (*real_tgamma)(double dbl);
-static double (*real_tgammaf)(float dbl);
+static float (*real_tgammaf)(float dbl);
 
 static double (*real_lgamma_r)(double dbl, int *signgamp);
 static float (*real_lgammaf_r)(float dbl, int *signgamp);

tests/check_result.py

@@ -5,7 +5,7 @@
 
 
 def load_value(filename):
-    value = np.loadtxt(filename)
+    value = np.loadtxt(filename, dtype=np.float64)
     return value
 
 

tests/data/math-functions-binary32-lgamma_r.txt

@@ -0,0 +1 @@
+lgammaf_r 3.5

tests/data/math-functions-binary32-sincos.txt

@@ -0,0 +1 @@
+sincosf 1

tests/math-functions-binary32-univariate.txt → tests/data/math-functions-binary32-univariate.txt

@@ -23,4 +23,4 @@ y1f 6
 erff 1
 erfcf 1
 lgammaf .5
-tgammaf .5
+tgammaf .5

tests/data/math-functions-binary64-lgamma_r.txt

@@ -0,0 +1 @@
+lgamma_r 3.5

tests/data/math-functions-binary64-sincos.txt

@@ -0,0 +1 @@
+sincos 1

tests/test.c

@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +26,8 @@ void eval(char *argv[]) {
     printf(FMT(x), res);
   }
 }
-#elif BIVAR
+#endif
+#ifdef BIVAR
 void eval(char *argv[]) {
   REAL x = atof(argv[1]);
   REAL y = atof(argv[2]);
@@ -34,7 +36,8 @@ void eval(char *argv[]) {
     printf(FMT(x), res);
   }
 }
-#elif LGAMMA_R
+#endif
+#ifdef LGAMMA_R
 void eval(char *argv[]) {
   REAL x = atof(argv[1]);
   int *sign;
@@ -43,17 +46,16 @@ void eval(char *argv[]) {
     printf(FMT(x), res);
   }
 }
-#elif SINCOS
+#endif
+#ifdef SINCOS
 void eval(char *argv[]) {
   REAL x = atof(argv[1]);
-  REAL *cos, *sin;
+  REAL cosx, sinx;
   for (int i = 0; i < N; i++) {
-    FUNCTION(x, cos, sin);
-    printf(FMT2(x), *cos, *sin);
+    FUNCTION(x, &cosx, &sinx);
+    printf(FMT2(x), cosx, sinx);
   }
 }
-#else
-#error "No signature provided"
 #endif
 
 int main(int argc, char *argv[]) {

tests/test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export VFC_BACKENDS="libinterflop_mca.so --mode=pb --precision-binary64=52 --precision-binary32=23"
+export VFC_BACKENDS="libinterflop_mca.so --mode=mca --precision-binary64=53 --precision-binary32=24"
 export LD_PRELOAD=$PWD/../libmath.so
 
 declare -A signature_a
@@ -28,11 +28,19 @@ function check_compilation() {
     fi
 }
 
+function check_file_exist() {
+    if [[ ! -f $1 ]]; then
+        echo "File ${1} does not exist"
+        exit 1
+    fi
+}
+
 function compile() {
     TYPE=$1
     SIG=$2
     FUNCTION=$3
-    gcc test.c -lm -DREAL=$TYPE -D$SIG -DFUNCTION=$FUNCTION -o test
+    echo "gcc test.c -lm -DREAL=$TYPE -D$SIG -DFUNCTION=$FUNCTION -o test"
+    gcc -g test.c -lm -DREAL=$TYPE -D$SIG -DFUNCTION=$FUNCTION -o test
     check_compilation
 }
 
@@ -42,31 +50,46 @@ function run() {
 
 IFS=" "
 for TYPE in "${!type_a[@]}"; do
+    FILE=data/"math-functions-${type_a[$TYPE]}-${signature_a[univar]}.txt"
     while read -r FUNCTION POINT ; do
         echo "Evalue $FUNCTION on ${POINT}"
         compile $TYPE UNIVAR $FUNCTION
         run $POINT
         assert_noise
-    done < math-functions-${type_a[$TYPE]}-${signature_a[univar]}.txt
+    done < $FILE
 done
 
 IFS=" "
 for TYPE in "${!type_a[@]}"; do
+    FILE=data/"math-functions-${type_a[$TYPE]}-${signature_a[bivar]}.txt"
     while read -r FUNCTION POINT1 POINT2 ; do
         echo "Evalue $FUNCTION on ${POINT}"
         compile $TYPE BIVAR $FUNCTION
         run $POINT1 $POINT2
         assert_noise
-    done < math-functions-${type_a[$TYPE]}-${signature_a[bivar]}.txt
+    done < $FILE
+done
+
+IFS=" "
+for TYPE in "${!type_a[@]}"; do
+    FILE=data/"math-functions-${type_a[$TYPE]}-${signature_a[sincos]}.txt"
+    while read -r FUNCTION POINT ; do
+        echo "Evalue $FUNCTION on ${POINT}"
+        compile $TYPE SINCOS $FUNCTION
+        run $POINT
+        assert_noise
+    done < $FILE
+done
+
+IFS=" "
+for TYPE in "${!type_a[@]}"; do
+    FILE=data/"math-functions-${type_a[$TYPE]}-${signature_a[lgamma_r]}.txt"
+    check_file_exist $FILE
+    while read -r FUNCTION POINT ; do
+        echo "Evalue $FUNCTION on ${POINT}"
+        compile $TYPE LGAMMA_R $FUNCTION
+        run $POINT
+        assert_noise
+    done < $FILE
 done
 
-# for TYPE in "${!type_a[@]}"; do
-#     while read -r FUNCTION ; do
-#         gcc test.c -DREAL=$TYPE -DBIVAR -DFUNCTION=$FUNCTION -o test
-#         ./test 0.1 0.1 > outputs
-#         res=$(std_1)
-#         assert_noise $res
-#         res=$(std_2)
-#         assert_noise $res
-#     done < math-functions-${type_a[$TYPE]}-${signature[BIVAR]}.txt
-# done