From 3ebf9aa216618a6e5e2fcf931f65629ae1800568 Mon Sep 17 00:00:00 2001
From: Ploc <ploc@garoche.net>
Date: Wed, 11 Jan 2017 00:40:52 +0100
Subject: [PATCH] Remove generated files (.h for include for as well as .in
files of configure)
---
include/conv.h | 30 -----
include/math.h | 75 ------------
include/mpfr_lustre.h | 75 ------------
src/version.ml | 8 --
test/test-compile.sh | 271 ------------------------------------------
5 files changed, 459 deletions(-)
delete mode 100644 include/conv.h
delete mode 100644 include/math.h
delete mode 100644 include/mpfr_lustre.h
delete mode 100644 src/version.ml
delete mode 100644 test/test-compile.sh
diff --git a/include/conv.h b/include/conv.h
deleted file mode 100644
index 6b6b86b6..00000000
--- a/include/conv.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* C code generated by lustrec
- Version number 1.1-Unversioned directory
- Code is C99 compliant
- Using (double) floating-point numbers */
-
-#ifndef _CONV
-#define _CONV
-
-/* Imports standard library */
-#include "/Users/Teme/Documents/GitHub/lustrec/include/lustrec/arrow.h"
-
-
-/* Import dependencies */
-
-/* Types definitions */
-
-/* Global constant (declarations, definitions are in C file) */
-
-/* Structs declarations */
-
-/* Nodes declarations */
-extern double int_to_real (int in1
- );
-
-extern int real_to_int (double in1
- );
-
-
-#endif
-
diff --git a/include/math.h b/include/math.h
deleted file mode 100644
index 2a3c6a9b..00000000
--- a/include/math.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* C code generated by lustrec
- Version number 1.1-Unversioned directory
- Code is C99 compliant
- Using (double) floating-point numbers */
-
-#ifndef _MATH
-#define _MATH
-
-/* Imports standard library */
-#include "/Users/Teme/Documents/GitHub/lustrec/include/lustrec/arrow.h"
-
-
-/* Import dependencies */
-
-/* Types definitions */
-
-/* Global constant (declarations, definitions are in C file) */
-
-/* Structs declarations */
-
-/* Nodes declarations */
-extern double sqrt (double x
- );
-
-extern double sinh (double x
- );
-
-extern double sin (double x
- );
-
-extern double pow (double x, double n
- );
-
-extern double fabs (double x
- );
-
-extern double erf (double x
- );
-
-extern double ceil (double x
- );
-
-extern double cosh (double x
- );
-
-extern double cos (double x
- );
-
-extern double cbrt (double x
- );
-
-extern double atanh (double x
- );
-
-extern double atan2 (double x, double n
- );
-
-extern double atan (double x
- );
-
-extern double asinh (double x
- );
-
-extern double asin (double x
- );
-
-extern double acosh (double x
- );
-
-extern double acos (double x
- );
-
-
-#endif
-
diff --git a/include/mpfr_lustre.h b/include/mpfr_lustre.h
deleted file mode 100644
index 85363ef3..00000000
--- a/include/mpfr_lustre.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* C code generated by lustrec
- Version number 1.1-Unversioned directory
- Code is C99 compliant
- Using MPFR multi-precision numbers */
-
-#ifndef _MPFR_LUSTRE
-#define _MPFR_LUSTRE
-
-/* Imports standard library */
-#include <mpfr.h>
-#include "/Users/Teme/Documents/GitHub/lustrec/include/lustrec/arrow.h"
-
-
-/* Import dependencies */
-
-/* Types definitions */
-
-/* Global constant (declarations, definitions are in C file) */
-
-/* Global initialization declaration */
-extern void MPFR_LUSTRE_INIT ();
-
-/* Global clear declaration */
-extern void MPFR_LUSTRE_CLEAR ();
-
-/* Structs declarations */
-
-/* Nodes declarations */
-extern void MPFRNeq_step (mpfr_t i1, mpfr_t i2,
- _Bool (*out)
- );
-
-extern void MPFREq_step (mpfr_t i1, mpfr_t i2,
- _Bool (*out)
- );
-
-extern void MPFRGt_step (mpfr_t i1, mpfr_t i2,
- _Bool (*out)
- );
-
-extern void MPFRGe_step (mpfr_t i1, mpfr_t i2,
- _Bool (*out)
- );
-
-extern void MPFRLt_step (mpfr_t i1, mpfr_t i2,
- _Bool (*out)
- );
-
-extern void MPFRLe_step (mpfr_t i1, mpfr_t i2,
- _Bool (*out)
- );
-
-extern void MPFRDiv_step (mpfr_t i1, mpfr_t i2,
- mpfr_t out
- );
-
-extern void MPFRTimes_step (mpfr_t i1, mpfr_t i2,
- mpfr_t out
- );
-
-extern void MPFRMinus_step (mpfr_t i1, mpfr_t i2,
- mpfr_t out
- );
-
-extern void MPFRPlus_step (mpfr_t i1, mpfr_t i2,
- mpfr_t out
- );
-
-extern void MPFRUminus_step (mpfr_t i,
- mpfr_t out
- );
-
-
-#endif
-
diff --git a/src/version.ml b/src/version.ml
deleted file mode 100644
index 33a823fa..00000000
--- a/src/version.ml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-let number = "1.4-472"
-
-let codename ="Xia/Xiang-dev"
-
-let prefix = "/home/ploc/Local"
-
-let include_path = prefix ^ "/include/lustrec"
diff --git a/test/test-compile.sh b/test/test-compile.sh
deleted file mode 100644
index 1ab41f8a..00000000
--- a/test/test-compile.sh
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/bin/bash
-
-eval set -- $(getopt -n $0 -o "-aciwvh:" -- "$@")
-
-declare c i w h a v
-declare -a files
-
-SRC_PREFIX=/home/ploc/tmp/merge/cavale/lustrec-tests/
-#SRC_PREFIX=`svn info --xml | grep wcroot | sed "s/<[^>]*>//g"`/lustre_compiler
-NOW=`date "+%y%m%d%H%M"`
-report=`pwd`/report-1.4-472-$NOW
-LUSTREC=lustrec
-mkdir -p build
-build=`pwd`"/build"
-
-gcc_compile() {
- if [ $verbose -gt 1 ]; then
- echo "gcc -c -Wall -Wno-unused-but-set-variable -I ../../include/ $1.c > /dev/null"
- fi
- gcc -c -Wall -Wno-unused-but-set-variable -I ../../include/ "$1".c > /dev/null;
- if [ $? -ne 0 ]; then
- rgcc="INVALID";
- else
- rgcc="VALID"
- fi
-}
-
-lustrec_compile() {
- if [ $verbose -gt 1 ]; then
- echo "$LUSTREC $@"
- fi
- $LUSTREC "$@";
- if [ $? -ne 0 ]; then
- rlustrec="INVALID";
- else
- rlustrec="VALID"
- fi
-}
-
-base_compile() {
- while IFS=, read -r file main opts
- do
- name=`basename "$file" .lus`
- ext=".lus"
- if [ `dirname "$file"`/"$name" = "$file" ]; then
- name=`basename "$file" .lusi`
- ext=".lusi"
- fi
- dir=${SRC_PREFIX}/`dirname "$file"`
- pushd $dir > /dev/null
-
- if [ "$main" != "" ]; then
- lustrec_compile -d $build -verbose 0 $opts -node $main $name$ext;
- else
- lustrec_compile -d $build -verbose 0 $opts $name$ext
- fi
- pushd $build > /dev/null
-
- if [ $ext = ".lus" ] && [ "$opts" != "-lusi" ]; then
- gcc_compile "$name";
- else
- rgcc="NONE"
- fi
- popd > /dev/null
- popd > /dev/null
-
- if [ $verbose -gt 0 ]; then
- echo "lustrec ($rlustrec), gcc($rgcc), $dir, ${name}${ext}, node $main" | column -t -s',' | tee -a $report;
- else
- echo "lustrec ($rlustrec), gcc($rgcc), $dir, ${name}${ext}, node $main" | column -t -s',' | tee -a $report | grep "INVALID\|ERROR\|UNKNOWN"
- fi;
- done < $file_list
-}
-
-inline_compile () {
- while IFS=, read -r file main opts
- do
- name=`basename "$file" .lus`
- ext=".lus"
- if [ `dirname "$file"`/"$name" = "$file" ]; then
- name=`basename "$file" .lusi`
- ext=".lusi"
- fi
- dir=${SRC_PREFIX}/`dirname "$file"`
- pushd $dir > /dev/null
-
- if [ "$main" != "" ]; then
- lustrec_compile -d $build -verbose 0 $opts -inline -witnesses -node $main $name$ext;
- else
- if [ "$ext" = ".lusi" ]; then
- lustrec_compile -d $build -verbose 0 $opts $name$ext;
- else
- rlustrec="NONE"
- rgcc="NONE"
- fi
- fi
- pushd $build > /dev/null
-
- if [ "$main" != "" ] && [ $ext = ".lus" ] && [ "$opts" != "-lusi" ]; then
- gcc_compile "$name";
- else
- rgcc="NONE"
- fi
- popd > /dev/null
- popd > /dev/null
-
- if [ $verbose -gt 0 ]; then
- echo "lustrec inlined ($rlustrec), gcc ($rgcc), $dir, ${name}${ext}, node $main" | column -t -s',' | tee -a $report;
- else
- echo "lustrec inlined ($rlustrec), gcc ($rgcc), $dir, ${name}${ext}, node $main" | column -t -s',' | tee -a $report | grep "INVALID\|ERROR\|UNKNOWN"
- fi;
- done < $file_list
-}
-
-inline_compile_with_check () {
-# Checking inlining
- while IFS=, read -r file main opts
- do
- name=`basename "$file" .lus`
- ext=".lus"
- if [ `dirname "$file"`/"$name" = "$file" ]; then
- name=`basename "$file" .lusi`
- ext=".lusi"
- fi
- dir=${SRC_PREFIX}/`dirname "$file"`
- pushd $dir > /dev/null
-
- if [ "$main" != "" ]; then
- lustrec_compile -d $build -verbose 0 $opts -inline -witnesses -node $main $name$ext;
- else
- if [ "$ext" = ".lusi" ]; then
- lustrec_compile -d $build -verbose 0 $opts $name$ext;
- else
- rlustrec="NONE"
- rgcc="NONE"
- fi
- fi
- popd > /dev/null
- pushd $build > /dev/null
-
- if [ "$main" != "" ] && [ $ext = ".lus" ] && [ "$opts" != "-lusi" ]; then
- gcc_compile "$name";
- else
- rgcc="NONE"
- fi
- # Cheching witness
-
- if [ "$main" != "" ] && [ $ext = ".lus" ] && [ "$opts" != "-lusi" ]; then
- mv ${name}_witnesses/inliner_witness.lus ${name}_inliner_witness.lus
- lustrec_compile -verbose 0 -horn-traces -node check ${name}_inliner_witness.lus
- z3="`z3 -T:10 ${name}_inliner_witness.smt2 | xargs`"
- if [ "x`echo $z3 | grep -o unsat`" == "xunsat" ]; then
- rinlining="VALID";
- elif [ "x`echo $z3 | xargs | grep -o error`" == "xerror" ]; then
- rinlining="ERROR";
- elif [ "x`echo $z3 | xargs | grep -o unknown`" == "xunknown" ]; then
- rinlining="UNKNOWN";
- elif [ "x`echo $z3 | xargs | grep -o timeout`" == "xtimeout" ]; then
- rinlining="TIMEOUT"
- else
- rinlining="INVALID"
- fi
- else
- rinlining="NONE"
- fi
- popd > /dev/null
-
- if [ $verbose -gt 0 ]; then
- echo "lustrec inlined ($rlustrec), gcc ($rgcc), inlining check ($rinlining), $dir, ${name}${ext}, node $main" | column -t -s',' | tee -a $report;
- else
- echo "lustrec inlined ($rlustrec), gcc ($rgcc), inlining check ($rinlining), $dir, ${name}${ext}, node $main" | column -t -s',' | tee -a $report | grep "TIMEOUT\|INVALID\|ERROR\|UNKNOWN"
- fi
-done < $file_list
-
-}
-
-check_prop () {
- while IFS=, read -r file main opts
- do
- name=`basename "$file" .lus`
- if [ "$name" = "$file" ]; then
- return 0
- fi
- dir=${SRC_PREFIX}/`dirname "$file"`
- pushd $dir > /dev/null
-
- # Checking horn backend
- if [ "$main" != "" ]; then
- lustrec_compile -horn-traces -horn-query -d $build -verbose 0 $opts -node $main $name".lus";
- else
- lustrec_compile -horn-traces -horn-query -d $build -verbose 0 $opts $name".lus"
- fi
-
- # echo "z3 $build/$name".smt2
- # TODO: This part of the script has to be optimized
- z3="`z3 -T:10 ${build}/${name}.smt2 | xargs`"
- if [ "x`echo $z3 | grep -o unsat`" == "xunsat" ]; then
- rhorn="VALID";
- elif [ "x`echo $z3 | xargs | grep -o error`" == "xerror" ]; then
- rhorn="ERROR";
- elif [ "x`echo $z3 | xargs | grep -o unknown`" == "xunknown" ]; then
- rhorn="UNKNOWN";
- elif [ "x`echo $z3 | xargs | grep -o timeout`" == "xtimeout" ]; then
- rhorn="TIMEOUT"
- else
- rhorn="INVALID"
- fi
- if [ $verbose -gt 0 ]; then
- echo "lustrec ($rlustrec), horn-pdr ($rhorn), $dir, ${name}.lus, node $main" | column -t -s',' | tee -a $report;
- else
- echo "lustrec ($rlustrec), horn-pdr ($rhorn), $dir, ${name}.lus, node $main" | column -t -s',' | tee -a $report | grep "INVALID\|ERROR\|UNKNOWN"
- fi
- popd > /dev/null
-done < $file_list
-}
-
-usage () {
-echo "usage: $0 [-aciwh] file_list"
-echo "-a: perform all steps"
-echo "-c: basic compilation"
-echo "-i: compile with inline mode"
-echo "-w: compile with inline mode. Check the inlining with z3"
-echo "-h: check files with the horn-pdf backend (requires z3)"
-echo "-v <int>: verbose level"
-}
-
-verbose=0
-nobehavior=1
-
-while [ $# -gt 0 ] ; do
- case "$1" in
- -v) shift ; verbose="$1"; shift ;;
- -a) nobehavior=0; c=1 ; w=1; h=1; shift ;;
- -c) nobehavior=0; c=1 ; shift ;;
- -i) nobehavior=0; i=1 ; shift ;;
- -w) nobehavior=0; w=1 ; shift ;;
- -h) nobehavior=0; h=1 ; shift ;;
- --) shift ;;
- -*) echo "bad option '$1'" ; exit 1 ;;
- *) files=("${files[@]}" "$1") ; shift ;;
- esac
-done
-
-file_list=${files[0]}
-
-
-if [ ${#files} -eq 0 ] ; then
- echo input list required
- usage
- exit 1
-fi
-
-# cleaning directory $build
-
-rm -f "$build"/* 2> /dev/null
-
-# executing tests
-
-[ ! -z "$c" ] && base_compile
-[ ! -z "$i" ] && inline_compile
-[ ! -z "$w" ] && inline_compile_with_check
-[ ! -z "$h" ] && check_prop
-[ "$nobehavior" -eq 1 ] && echo "Must provide an argument in [aciwh]" && usage
-
-
- # Removing Generated lusi file
- #grep generated ../${file}i > /dev/null
- #if [ $? -ne 1 ];then
- # rm ../${file}i
- #fi
-
--
GitLab