Remove some duplicated scripts.

Author: qinsoon

.github/scripts/build-normal.sh

@@ -2,12 +2,23 @@ set -xe
 
 . $(dirname "$0")/common.sh
 
-unset JAVA_TOOL_OPTIONS
-unset MMTK_PLAN
+ensure_env OPENJDK_PATH
+ensure_env OPENJDK_BUILD_TARGET
 
-# To OpenJDK folder
-cd $OPENJDK_PATH
+# Use fastdebug if DEBUG_LEVEL is unset
+DEBUG_LEVEL=${DEBUG_LEVEL:="fastdebug"}
+
+# Build target. Could be empty, or product-bundles.
+build_target=$1
 
-# Build
+# Build product bundle
+cd $OPENJDK_PATH
 sh configure --disable-warnings-as-errors --with-debug-level=$DEBUG_LEVEL
-make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$BINDING_PATH/openjdk
+make CONF=linux-x86_64-normal-server-$DEBUG_LEVEL THIRD_PARTY_HEAP=$BINDING_PATH/openjdk $OPENJDK_BUILD_TARGET
+
+if [[ $DEBUG_LEVEL == "fastdebug" && $OPENJDK_BUILD_TARGET == "product-bundles" ]]; then
+    pushd build/linux-x86_64-normal-server-fastdebug/bundles
+    F=`ls *_bin-debug.tar.gz`
+    mv $F ${F/_bin-debug/_bin}
+    popd
+fi

.github/scripts/ci-build.sh

@@ -9,10 +9,10 @@ rustup component add clippy --toolchain $RUSTUP_TOOLCHAIN
 rustup component add rustfmt --toolchain $RUSTUP_TOOLCHAIN
 rustup override set $RUSTUP_TOOLCHAIN
 
-# Download dacapo
-mkdir -p $DACAPO_PATH
-wget https://downloads.sourceforge.net/project/dacapobench/archive/2006-10-MR2/dacapo-2006-10-MR2.jar -O $DACAPO_PATH/dacapo-2006-10-MR2.jar
+# Install running
+pip3 install running-ng
 
 # Install dependencies
 sudo apt-get update -y
+sudo apt-get install dos2unix
 sudo apt-get install build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev libcups2-dev libasound2-dev libxrandr-dev

.github/scripts/ci-setup.sh

@@ -6,7 +6,7 @@ unset JAVA_TOOL_OPTIONS
 
 export MMTK_EXTREME_ASSERTIONS=1
 . $(dirname "$0")/ci-build.sh
-export JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java
+export TEST_JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java
 
 cd $OPENJDK_PATH
 

.github/scripts/ci-test-assertions.sh

@@ -22,7 +22,7 @@ run_test() {
 unset JAVA_TOOL_OPTIONS
 unset MMTK_PLAN
 
-export JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java
+export TEST_JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java
 
 # --- Normal test ---
 build

.github/scripts/ci-test-malloc-mark-sweep.sh

@@ -8,7 +8,7 @@ export MMTK_EXTREME_ASSERTIONS=0
 export VO_BIT=1
 . $(dirname "$0")/ci-build.sh
 
-export JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java
+export TEST_JAVA_BIN=$OPENJDK_PATH/build/linux-x86_64-normal-server-$DEBUG_LEVEL/jdk/bin/java
 
 run_subset() {
     heap_multiplier=$1

.github/scripts/ci-test-vo-bit.sh

@@ -1,11 +1,6 @@
 BINDING_PATH=$(realpath $(dirname "$0"))/../..
-OPENJDK_PATH=$BINDING_PATH/repos/openjdk
-DACAPO_PATH=$OPENJDK_PATH/dacapo
-
 RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`
 
-DEBUG_LEVEL=fastdebug
-
 # dacapo2006 min heap for mark compact
 MINHEAP_ANTLR=5
 MINHEAP_FOP=13
@@ -16,6 +11,16 @@ MINHEAP_HSQLDB=117
 MINHEAP_ECLIPSE=23
 MINHEAP_XALAN=21
 
+# ensure_env 'var_name'
+ensure_env() {
+    env_var=$1
+
+    if ! [[ -v $env_var ]]; then
+        echo "Environment Variable "$env_var" is required. "
+        exit 1
+    fi
+}
+
 runbms_dacapo2006_with_heap_multiplier()
 {
     benchmark=$1
@@ -41,5 +46,8 @@ runbms_dacapo2006_with_heap_size()
 
     shift 3
 
-    $JAVA_BIN -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms$min_heap_str -Xmx$max_heap_str $@ -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar $benchmark
+    ensure_env TEST_JAVA_BIN
+    ensure_env DACAPO_PATH
+
+    $TEST_JAVA_BIN -XX:+UseThirdPartyHeap -server -XX:MetaspaceSize=100M -Xms$min_heap_str -Xmx$max_heap_str $@ -jar $DACAPO_PATH/dacapo-2006-10-MR2.jar $benchmark
 }

.github/scripts/common.sh

@@ -28,13 +28,11 @@ jobs:
         path: ./git/openjdk
         ref: ${{ steps.extract-openjdk-revision.outputs.openjdk-revision }}
     - name: Setup environment
-      run: ./.github/scripts/setup.sh
-      working-directory: ./git/mmtk-openjdk
-    - name: Style checks
-      run: ./.github/scripts/style-check.sh
+      run: ./.github/scripts/ci-setup.sh
       working-directory: ./git/mmtk-openjdk
     - name: Build MMTk OpenJDK ${{ matrix.debug-level }}
-      run: DEBUG_LEVEL=${{ matrix.debug-level }} ./.github/scripts/build-normal.sh
+      run: |
+        OPENJDK_PATH=$GITHUB_WORKSPACE/git/openjdk DEBUG_LEVEL=${{ matrix.debug-level }} OPENJDK_BUILD_TARGET=product-bundles ./.github/scripts/ci-build.sh
       working-directory: ./git/mmtk-openjdk
     - name: Upload bundles
       uses: actions/upload-artifact@v3