Minor modifications to ci scripts.

.gitlab-ci.yml

@@ -5,8 +5,8 @@ before_script:
   - export QUESTASIM_VERSION=-10.6b
   - export QUESTASIM_FLAGS=-noautoldlibpath
   - export CXX=g++-7.2.0 CC=gcc-7.2.0
-  - export RISCV=/usr/scratch2/larain1/gitlabci/riscv_install
-  - export VERILATOR_ROOT=/usr/scratch2/larain1/gitlabci/verilator-3.924
+  - export RISCV=/scratch2/gitlabci/riscv_install
+  - export VERILATOR_ROOT=/scratch2/gitlabci/verilator-3.924
   # setup dependent paths
   - export PATH=${RISCV}/bin:$VERILATOR_ROOT/bin:${PATH}
   - export LIBRARY_PATH=$RISCV/lib
@@ -15,8 +15,13 @@ before_script:
   - export CPLUS_INCLUDE_PATH=$RISCV/include:$VERILATOR_ROOT/include:/usr/pack/gcc-7.2.0-af/linux-x64/include
   # number of parallel jobs to use for make commands and simulation
   - export NUM_JOBS=4
+  - which java
+  - java -version
+  - which git
+  - git --version
   - ci/make-tmp.sh
-  - git submodule update --init --recursive
+  - git submodule init
+  - git submodule update --recursive
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive

Makefile

@@ -139,7 +139,8 @@ list_incdir := $(foreach dir, ${incdir}, +incdir+$(dir))
 
 # RISCV torture setup
 riscv-torture-dir    := tmp/riscv-torture
-riscv-torture-bin    := java -Xmx1G -Xss8M -XX:MaxPermSize=128M -jar sbt-launch.jar
+# old java flags  -Xmx1G -Xss8M -XX:MaxPermSize=128M
+riscv-torture-bin    := java -XshowSettings -Xdiag -jar sbt-launch.jar
 
 # Build the TB and module using QuestaSim
 build: $(library) $(library)/.build-srcs $(library)/.build-tb $(dpi-library)/ariane_dpi.so

ci/get-torture.sh

@@ -17,5 +17,6 @@ git submodule update --init --recursive
 # copy ariane specific config
 cp config/default.config config/default.config.bak
 cp $ROOT/ci/default.config config/default.config
+git checkout ./output/Makefile
 git apply $ROOT/ci/torture_make.patch
 

ci/install-dtc.sh

@@ -9,7 +9,7 @@ if [ -z ${NUM_JOBS} ]; then
     NUM_JOBS=1
 fi
 
-if [ ! -e "$RISCV/dtc/dtc" ]; then
+if [ ! -e "$RISCV/bin/dtc" ]; then
     echo "Installing DTC"
     git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git
     cd dtc

ci/torture_make.patch

@@ -4,38 +4,38 @@ index cf1214f..c81bccc 100644
 +++ b/output/Makefile
 @@ -20,9 +20,9 @@ extra_files =
  #--------------------------------------------------------------------
- 
+
  RISCV_GCC = riscv64-unknown-elf-gcc
 -RISCV_GCC_OPTS = -nostdlib -nostartfiles -Wa,-march=RVIMAFDXhwacha
 +RISCV_GCC_OPTS = -nostdlib -nostartfiles -Wa,-march=rv64imc
  RISCV_OBJDUMP = riscv64-unknown-elf-objdump --disassemble-all --section=.text --section=.data --section=.bss
 -RISCV_SIM = spike --extension=hwacha
-+RISCV_SIM = spike 
- 
++RISCV_SIM = spike
+
  #------------------------------------------------------------
  # Build assembly tests
 @@ -38,9 +38,6 @@ $(asm_tests_dump): %.dump: %
  $(asm_tests_bin): %: %.S $(extra_files)
  	$(RISCV_GCC) $(RISCV_GCC_OPTS) -I../env/p -T../env/p/link.ld $< -o $@
- 
+
 -$(asm_tests_hex): %.hex: % $(extra_files)
 -	elf2hex 16 16384 $< > $@
 -
  $(asm_tests_sig): %.sig: %
  	$(RISCV_SIM) +signature=$@ $<
- 
+
 @@ -51,12 +48,12 @@ run: $(asm_tests_sig)
  	echo; perl -ne 'print "  [$$1] $$ARGV \t$$2\n" if /\*{3}(.{8})\*{3}(.*)/' \
  	       $(asm_tests_sig); echo;
- 
+
 -junk += $(asm_tests_bin) $(asm_tests_dump) $(asm_tests_sig) $(asm_tests_hex)
-+junk += $(asm_tests_bin) $(asm_tests_dump) $(asm_tests_sig) 
- 
++junk += $(asm_tests_bin) $(asm_tests_dump) $(asm_tests_sig)
+
  #------------------------------------------------------------
  # Default
- 
+
 -all: $(asm_tests_dump) $(asm_tests_hex)
-+all: $(asm_tests_dump) 
- 
++all: $(asm_tests_dump)
+
  #------------------------------------------------------------
  # Clean up