From e0e259486fa56155c9a0a1a3f5261c2e315c6450 Mon Sep 17 00:00:00 2001 From: Wen HU Date: Wed, 31 Mar 2021 12:45:10 -0700 Subject: [PATCH 1/4] enable basic debug build tests in jenkins --- build/jenkins/main.sh | 2 ++ testsuite/driver/src/api/linker.py | 2 +- testsuite/driver/src/mod/CO0.py | 2 +- testsuite/driver/src/mod/CO2.py | 2 +- testsuite/driver/src/mod/IR.py | 4 ++-- testsuite/driver/src/mod/O0.py | 16 ++++++++-------- testsuite/driver/src/mod/O2.py | 16 ++++++++-------- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/build/jenkins/main.sh b/build/jenkins/main.sh index f128a23c5c..c6a7467b85 100755 --- a/build/jenkins/main.sh +++ b/build/jenkins/main.sh @@ -13,6 +13,8 @@ function debug_test { make make irbuild make mplfe + make irbuild_test + # make c_test } function release_test { diff --git a/testsuite/driver/src/api/linker.py b/testsuite/driver/src/api/linker.py index 3b95280dc6..c9f7c22ec9 100644 --- a/testsuite/driver/src/api/linker.py +++ b/testsuite/driver/src/api/linker.py @@ -22,5 +22,5 @@ class Linker(ShellOperator): self.lib = lib def get_command(self, variables): - self.command = "${TOOL_BIN_PATH}/clang++ -g3 -O2 -x assembler-with-cpp -march=armv8-a -target aarch64-linux-gnu -c ${APP}.VtableImpl.s && ${TOOL_BIN_PATH}/clang++ ${APP}.VtableImpl.o -L${OUT_ROOT}/aarch64-clang-release/ops/" + self.lib + " -g3 -O2 -march=armv8-a -target aarch64-linux-gnu -fPIC -shared -o ${APP}.so ${OUT_ROOT}/aarch64-clang-release/ops/mrt_module_init.o -fuse-ld=lld -rdynamic -lcore-all -lcommon-bridge -Wl,-z,notext -Wl,-T${OUT_ROOT}/aarch64-clang-release/ops/linker/maplelld.so.lds" + self.command = "${TOOL_BIN_PATH}/clang++ -g3 -O2 -x assembler-with-cpp -march=armv8-a -target aarch64-linux-gnu -c ${APP}.VtableImpl.s && ${TOOL_BIN_PATH}/clang++ ${APP}.VtableImpl.o -L${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/" + self.lib + " -g3 -O2 -march=armv8-a -target aarch64-linux-gnu -fPIC -shared -o ${APP}.so ${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mrt_module_init.o -fuse-ld=lld -rdynamic -lcore-all -lcommon-bridge -Wl,-z,notext -Wl,-T${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/linker/maplelld.so.lds" return super().get_final_command(variables) diff --git a/testsuite/driver/src/mod/CO0.py b/testsuite/driver/src/mod/CO0.py index e67394528e..f79ed7a467 100644 --- a/testsuite/driver/src/mod/CO0.py +++ b/testsuite/driver/src/mod/CO0.py @@ -28,7 +28,7 @@ CO0 = { infile="${APP}.B" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["mplcg"], option={ "mplcg": "--quiet" diff --git a/testsuite/driver/src/mod/CO2.py b/testsuite/driver/src/mod/CO2.py index 36d129027d..b6d43c0b7b 100644 --- a/testsuite/driver/src/mod/CO2.py +++ b/testsuite/driver/src/mod/CO2.py @@ -28,7 +28,7 @@ CO2 = { infile="${APP}.B" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["mplcg"], option={ "mplcg": "-O2 --quiet --no-schedule" diff --git a/testsuite/driver/src/mod/IR.py b/testsuite/driver/src/mod/IR.py index bec21265c3..1dc84c6810 100644 --- a/testsuite/driver/src/mod/IR.py +++ b/testsuite/driver/src/mod/IR.py @@ -22,11 +22,11 @@ IR = { ], "compile": [ Irbuild( - irbuild="${OUT_ROOT}/aarch64-clang-release/bin/irbuild", + irbuild="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/irbuild", infile="${APP}.mpl" ), Irbuild( - irbuild="${OUT_ROOT}/aarch64-clang-release/bin/irbuild", + irbuild="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/irbuild", infile="${APP}.irb.mpl" ), CheckFileEqual( diff --git a/testsuite/driver/src/mod/O0.py b/testsuite/driver/src/mod/O0.py index 9926eed052..73fa17640d 100644 --- a/testsuite/driver/src/mod/O0.py +++ b/testsuite/driver/src/mod/O0.py @@ -23,20 +23,20 @@ O0 = { "compile": [ Java2dex( jar_file=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" ], outfile="${APP}.dex", infile=["${APP}.java","${EXTRA_JAVA_FILE}"] ), Dex2mpl( - dex2mpl="${OUT_ROOT}/aarch64-clang-release/bin/dex2mpl", - mplt="${OUT_ROOT}/aarch64-clang-release/libjava-core/libcore-all.mplt", + dex2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/dex2mpl", + mplt="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/libjava-core/libcore-all.mplt", litprofile="${MAPLE_ROOT}/src/mrt/codetricks/profile.pv/meta.list", infile="${APP}.dex" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["me", "mpl2mpl", "mplcg"], option={ "me": "--quiet", @@ -55,11 +55,11 @@ O0 = { qemu="${TOOL_BIN_PATH}/qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party", - "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O2", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2", "./" ], - mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh", + mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh", garbage_collection_kind="RC", xbootclasspath="libcore-all.so", infile="${APP}.so", diff --git a/testsuite/driver/src/mod/O2.py b/testsuite/driver/src/mod/O2.py index e2f6fcaa87..4c55016a6a 100644 --- a/testsuite/driver/src/mod/O2.py +++ b/testsuite/driver/src/mod/O2.py @@ -23,20 +23,20 @@ O2 = { "compile": [ Java2dex( jar_file=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", - "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar" ], outfile="${APP}.dex", infile=["${APP}.java","${EXTRA_JAVA_FILE}"] ), Dex2mpl( - dex2mpl="${OUT_ROOT}/aarch64-clang-release/bin/dex2mpl", - mplt="${OUT_ROOT}/aarch64-clang-release/libjava-core/libcore-all.mplt", + dex2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/dex2mpl", + mplt="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/libjava-core/libcore-all.mplt", litprofile="${MAPLE_ROOT}/src/mrt/codetricks/profile.pv/meta.list", infile="${APP}.dex" ), Maple( - maple="${OUT_ROOT}/aarch64-clang-release/bin/maple", + maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple", run=["me", "mpl2mpl", "mplcg"], option={ "me": "--O2 --quiet", @@ -55,11 +55,11 @@ O2 = { qemu="${TOOL_BIN_PATH}/qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ - "${OUT_ROOT}/aarch64-clang-release/ops/third_party", - "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O2", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party", + "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2", "./" ], - mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh", + mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh", garbage_collection_kind="RC", xbootclasspath="libcore-all.so", infile="${APP}.so", -- Gitee From f137409da7c2d02d6eccf5397e4efa88f7598221 Mon Sep 17 00:00:00 2001 From: Wen HU Date: Wed, 31 Mar 2021 12:56:50 -0700 Subject: [PATCH 2/4] move testing into proper output sub-directories --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3e14acbf5b..4de0b8b361 100644 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ REALTARGET := $(TESTTARGET) endif .PHONY: $(TESTTARGET) ${TESTTARGET}: - @python3 $(MAPLE_ROOT)/testsuite/driver/src/driver.py --target=$(REALTARGET) --run-path=$(MAPLE_ROOT)/output/testsuite $(if $(MOD), --mod=$(MOD),) --j=$(THREADS) --retry --report=$(MAPLE_ROOT)/report.txt + @python3 $(MAPLE_ROOT)/testsuite/driver/src/driver.py --target=$(REALTARGET) --run-path=$(MAPLE_ROOT)/output/$(MAPLE_BUILD_TYPE)/testsuite $(if $(MOD), --mod=$(MOD),) --j=$(THREADS) --retry --report=$(MAPLE_ROOT)/report.txt endif .PHONY: cleanrsd -- Gitee From 6691d27fa4824e413f153160eacd5b2153b2d179 Mon Sep 17 00:00:00 2001 From: William Chen Date: Wed, 31 Mar 2021 14:08:42 -0700 Subject: [PATCH 3/4] Remove incorrect assert for agg struct parameter check --- src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp b/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp index b1cb6dabc4..11db2be0d0 100644 --- a/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp +++ b/src/mapleall/maple_be/src/cg/aarch64/aarch64_abi.cpp @@ -501,9 +501,6 @@ int32 ParmLocator::ProcessPtyAggWhenLocateNextParm(MIRType &mirType, PLocInfo &p * either all single fp or all double fp, then it can be passed by float-float. */ AArch64ArgumentClass classes[kMaxRegCount] = { kAArch64NoClass }; -#if DEBUG - int32 saveIntParmNum = nextGeneralRegNO; -#endif typeSize = beCommon.GetTypeSize(mirType.GetTypeIndex().GetIdx()); int32 aggCopySize = 0; if (typeSize > k16ByteSize) { @@ -534,7 +531,6 @@ int32 ParmLocator::ProcessPtyAggWhenLocateNextParm(MIRType &mirType, PLocInfo &p CHECK_FATAL(false, "param passing in FP reg not allowed here"); } else { pLoc.reg0 = AllocateGPRegister(); - ASSERT(nextGeneralRegNO == saveIntParmNum, "RegNo should be saved pramRegNO"); /* Rule C.11 */ ASSERT((pLoc.reg0 != kRinvalid) || (nextGeneralRegNO == AArch64Abi::kNumIntParmRegs), "reg0 should not be kRinvalid or nextGeneralRegNO should equal kNumIntParmRegs"); -- Gitee From 00cd89151641544ee1c50e288accb9448a53f313 Mon Sep 17 00:00:00 2001 From: Wen HU Date: Wed, 31 Mar 2021 14:36:08 -0700 Subject: [PATCH 4/4] enable c_test for debug version compilers --- build/jenkins/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/jenkins/main.sh b/build/jenkins/main.sh index c6a7467b85..b491188da7 100755 --- a/build/jenkins/main.sh +++ b/build/jenkins/main.sh @@ -14,7 +14,7 @@ function debug_test { make irbuild make mplfe make irbuild_test - # make c_test + make c_test } function release_test { -- Gitee