put alivecc, alive++, and opt driver into the main build dir instead of a subdir
MODIFY
CMakeLists.txt
CMakeLists.txt
@@ -177,7 +177,7 @@ if (BUILD_TV)
add_subdirectory(tv)
configure_file(
${CMAKE_SOURCE_DIR}/scripts/opt-alive.sh.in
- ${CMAKE_BINARY_DIR}/scripts/opt-alive.sh
+ ${CMAKE_BINARY_DIR}/opt-alive.sh
@ONLY
)
else()

MODIFY
README.md
README.md
@@ -82,7 +82,7 @@ pass.
Translation validation of a single LLVM unit test, using lit:
```
-~/llvm/build/bin/llvm-lit -vv -Dopt=$HOME/alive2/build/scripts/opt-alive.sh ~/llvm/llvm/test/Transforms/InstCombine/canonicalize-constant-low-bit-mask-and-icmp-sge-to-icmp-sle.ll
+~/llvm/build/bin/llvm-lit -vv -Dopt=$HOME/alive2/build/opt-alive.sh ~/llvm/llvm/test/Transforms/InstCombine/canonicalize-constant-low-bit-mask-and-icmp-sge-to-icmp-sle.ll
```
The output should be:
@@ -96,7 +96,7 @@ Testing Time: 0.11s
Translation validation of the LLVM unit tests:
```
-~/llvm/build/bin/llvm-lit -vv -Dopt=$HOME/alive2/build/scripts/opt-alive.sh ~/llvm/llvm/test/Transforms
+~/llvm/build/bin/llvm-lit -vv -Dopt=$HOME/alive2/build/opt-alive.sh ~/llvm/llvm/test/Transforms
```
Running Alive2 as a Clang plugin:
@@ -110,8 +110,8 @@ $ clang -O3 <src.c> -S -emit-llvm \
Or, more conveniently:
```
-$ $HOME/alive2/build/scripts/alivecc -O3 -c <src.c>
-$ $HOME/alive2/build/scripts/alive++ -O3 -c <src.cpp>
+$ $HOME/alive2/build/alivecc -O3 -c <src.c>
+$ $HOME/alive2/build/alive++ -O3 -c <src.cpp>
```

MODIFY
scripts/gen-dashboard.php
scripts/gen-dashboard.php
@@ -76,7 +76,7 @@ file_put_contents('web/data/data.txt', $entry, FILE_APPEND);
function correct_without_undef($test) {
echo "Testing $test without undef.. ";
- $output = `~/llvm/build/bin/llvm-lit -vv -Dopt="\$HOME/alive2/build/scripts/opt-alive.sh -tv-disable-undef-input" ~/llvm/llvm/test/$test 2>&1`;
+ $output = `~/llvm/build/bin/llvm-lit -vv -Dopt="\$HOME/alive2/build/opt-alive.sh -tv-disable-undef-input" ~/llvm/llvm/test/$test 2>&1`;
$ok = preg_match('/^ Passed:\s*1/Sm', $output) === 1;
echo ($ok ? "OK\n" : "buggy\n");
return $ok;

MODIFY
tests/lit/lit/formats/alive2test.py
tests/lit/lit/formats/alive2test.py
@@ -85,7 +85,7 @@ class Alive2Test(TestFormat):
clang_tv = test.endswith('.c') or test.endswith('.cpp')
if clang_tv:
- execpath = './scripts/%s' % ("alivecc" if test.endswith('.c')
+ execpath = './%s' % ("alivecc" if test.endswith('.c')
else "alive++")
# 30 seconds is too long to apply to all passes, just use the default to
cmd = [execpath, "-c", "-o", "/dev/null"]

MODIFY
tv/CMakeLists.txt
tv/CMakeLists.txt
@@ -12,12 +12,12 @@ if (CLANG_PLUGIN)
)
configure_file(
${CMAKE_SOURCE_DIR}/scripts/alivecc.in
- ${CMAKE_BINARY_DIR}/scripts/alivecc
+ ${CMAKE_BINARY_DIR}/alivecc
@ONLY
)
configure_file(
${CMAKE_SOURCE_DIR}/scripts/alivecc.in
- ${CMAKE_BINARY_DIR}/scripts/alive++
+ ${CMAKE_BINARY_DIR}/alive++
@ONLY
)
else()

put alivecc, alive++, and opt driver into the main build dir instead of a subdir (#597)