[Build script] Fix debug messages (#96)

Remove debug messages. There are still possible misuse of script
as options without "-" in the start will be ignored.

Author: Devjiu

scripts/compile.sh

@@ -3,81 +3,70 @@
 repo=intel/graph-compiler
 
 # Uncomment for script debug
-# set -ex
+# set -x
 
-function print_usage() {
+print_usage() {
     echo "Usage:"
     echo "$0 "
     echo "    [ -d | --dev  ] Dev build, build LLVM in current env and place all to 'external' dir"
     echo "    [ -l | --dyn  ] Dynamical linking, requires rebuild of LLVM, activates 'dev' option"
     echo "    [ -h | --help ] Print this message"
 }
 
-args=$(getopt -a -o dlh --long dev,dyn,help -- "$@")
-if [[ $? -gt 0 ]]; then
-    echo "first"
-    print_usage
-fi
-
 DEV_BUILD=false
 DYN_LINK=false
-eval set -- ${args}
-while :
-do
-    case $1 in
+for arg in "$@"; do
+    case $arg in
         -d | --dev)   
             DEV_BUILD=true 
-            shift   ;;
+            ;;
         -l | --dyn)
             DEV_BUILD=true 
             DYN_LINK=true 
-            shift   ;;
+            ;;
         -h | --help)
-            echo "in help"    
             print_usage
-            shift   ;;
+            exit 0
+            ;;
         # -- means the end of the arguments; drop this, and break out of the while loop
-        --) shift; break ;;
-        *) >&2 echo Unsupported option: $1
-            echo "in unsup"
-            print_usage ;;
+        *) 
+            echo Unsupported option: $arg
+            print_usage
+            exit 1
+            ;;
     esac
 done
 
 cd $(dirname "$0")/..
-project_dir=$PWD
-llvm_hash=$(cat cmake/llvm-version.txt)
+PROJECT_DIR=$PWD
+LLVM_HASH=$(cat cmake/llvm-version.txt)
 
-function load_llvm() {
-    local  mlir_dir=$1
+load_llvm() {
     local run_id
 
     run_id=$(gh run list -w "LLVM Build" --repo $repo --json databaseId --jq '.[0].databaseId')
 
     gh run download "$run_id" \
         --repo "$repo" \
-        --pattern "llvm-$llvm_hash" \
+        --pattern "llvm-$LLVM_HASH" \
         --dir "$llvm_dir"
     cd "$llvm_dir"
-    tar -zxf "llvm-$llvm_hash"/llvm.tgz
+    tar -zxf "llvm-$LLVM_HASH"/llvm.tgz
 
-    eval $mlir_dir="$PWD/lib/cmake/mlir"
-    cd "$project_dir"
-    return 0
+    MLIR_DIR="$PWD/lib/cmake/mlir"
+    cd "$PROJECT_DIR"
 }
 
-function build_llvm() {
-    local  mlir_dir=$1
-
+build_llvm() {
     if ! [ -d "llvm-project" ]; then
         git clone https://github.com/llvm/llvm-project.git
     fi
 
     cd llvm-project
-    git checkout ${llvm_hash}
+    git checkout ${LLVM_HASH}
 
     dylib=OFF
-    if [[ "$DYN_LINK" == 'true' ]]; then 
+    if [ "$DYN_LINK" = 'true' ]; then 
         dylib=ON
     fi
 
@@ -88,56 +77,54 @@ function build_llvm() {
         -DLLVM_INSTALL_GTEST=ON -DLLVM_BUILD_LLVM_DYLIB=$dylib -DLLVM_LINK_LLVM_DYLIB=$dylib
     cmake --build build 
 
-    eval $mlir_dir="$PWD/build/lib/cmake/mlir"
+    MLIR_DIR="$PWD/build/lib/cmake/mlir"
     cd ..
-    return 0
 }
 
-function get_llvm() {
-    local ret_val=$1
-
-    if [[ "$DEV_BUILD" == 'true' ]]; then
+# MLIR_DIR is set on all passes
+get_llvm() {
+    if [ "$DEV_BUILD" = 'true' ]; then
         mkdir -p externals
         cd externals
-        build_llvm val
-        eval $ret_val=\$val
+        build_llvm 
         cd ..
         return 0
     fi
 
-    llvm_dir=$project_dir/../install/llvm
-    if ! [ -f "$llvm_dir/llvm-$llvm_hash"/llvm.tgz ]; then
-        load_llvm val
-        eval $ret_val=\$val
+    llvm_dir=$PROJECT_DIR/../install/llvm
+    if ! [ -f "$llvm_dir/llvm-$LLVM_HASH"/llvm.tgz ]; then
+        load_llvm 
+    else 
+        MLIR_DIR="$llvm_dir/lib/cmake/mlir"
     fi
-    eval $ret_val="$llvm_dir/lib/cmake/mlir"
     return 0
 }
 
-get_llvm mlir_dir
+get_llvm
 
-fetch_dir=$project_dir/build/_deps
-dylib=OFF
-lit_path=""
-if [[ $(which lit) ]]; then
-    lit_path=$(which lit)
-fi
-if [[ "$DEV_BUILD" == 'true' ]]; then
-    fetch_dir=$project_dir/externals
-    lit_path=$project_dir/externals/llvm-project/build/bin/llvm-lit
+FETCH_DIR=$PROJECT_DIR/build/_deps
+DYLIB=OFF
+# written in this form to set LIT_PATH in any case
+if ! LIT_PATH=$(which lit) ; then
+    if [ "$DEV_BUILD" != 'true' ]; then
+        echo "========Warning======="
+        echo "   Lit not found.     "
+        echo "======================"
+    fi
 fi
-if [[ "$DYN_LINK" == 'true' ]]; then 
-    dylib=ON
+if [ "$DEV_BUILD" = 'true' ]; then
+    FETCH_DIR=$PROJECT_DIR/externals
+    LIT_PATH=$PROJECT_DIR/externals/llvm-project/build/bin/llvm-lit
 fi
-if [ -z "$lit_path" ]; then 
-    echo "========Warning======="
-    echo "   Lit not found.     "
+if [ "$DYN_LINK" = 'true' ]; then 
+    DYLIB=ON
 fi
 
 cmake -S . -G Ninja -B build \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DMLIR_DIR=$mlir_dir \
-    -DLLVM_EXTERNAL_LIT=$lit_path \
-    -DFETCHCONTENT_BASE_DIR=$fetch_dir \
-    -DGC_DEV_LINK_LLVM_DYLIB=$dylib
+    -DMLIR_DIR=$MLIR_DIR \
+    -DLLVM_EXTERNAL_LIT=$LIT_PATH \
+    -DFETCHCONTENT_BASE_DIR=$FETCH_DIR \
+    -DGC_DEV_LINK_LLVM_DYLIB=$DYLIB
+
 cmake --build build --parallel $(nproc)