From 3e1e157a9c2646ad46356f26438cc3b797bac0fd Mon Sep 17 00:00:00 2001 From: Tianqi Chen Date: Fri, 26 Feb 2021 17:30:58 -0500 Subject: [PATCH] [CI] Move ci-cpu to use llvm-11 (#7541) * [CI] Move ci-cpu to use llvm-11 * Fix the testcase of x86 codegen by relax the register names. --- .../unittest/test_target_codegen_x86.py | 21 +++++++------------ tests/scripts/task_config_build_cpu.sh | 2 +- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/tests/python/unittest/test_target_codegen_x86.py b/tests/python/unittest/test_target_codegen_x86.py index b581f72ec763..ec42e0a4d749 100644 --- a/tests/python/unittest/test_target_codegen_x86.py +++ b/tests/python/unittest/test_target_codegen_x86.py @@ -52,21 +52,14 @@ def fp16_to_fp32(target, width, match=None, not_match=None): not_matches = [l for l in assembly if re.search(not_match, l)] assert not not_matches - fp16_to_fp32( - "llvm -mcpu=skylake-avx512", 15, match="vcvtph2ps.*ymm", not_match="vcvtph2ps.*zmm" - ) - fp16_to_fp32("llvm -mcpu=skylake-avx512", 16, match="vcvtph2ps.*zmm") - fp16_to_fp32("llvm -mcpu=skylake-avx512", 17, match="vcvtph2ps.*zmm") - fp16_to_fp32("llvm -mcpu=skylake-avx512", 49, match="vcvtph2ps.*zmm") - fp16_to_fp32( - "llvm -mcpu=skylake-avx512 -mattr=-avx512f", - 49, - match="vcvtph2ps.*ymm", - not_match="vcvtph2ps.*zmm", - ) + fp16_to_fp32("llvm -mcpu=skylake-avx512", 15, match="vcvtph2ps.*mm") + fp16_to_fp32("llvm -mcpu=skylake-avx512", 16, match="vcvtph2ps.*mm") + fp16_to_fp32("llvm -mcpu=skylake-avx512", 17, match="vcvtph2ps.*mm") + fp16_to_fp32("llvm -mcpu=skylake-avx512", 49, match="vcvtph2ps.*mm") + fp16_to_fp32("llvm -mcpu=skylake-avx512 -mattr=-avx512f", 49, match="vcvtph2ps.*mm") fp16_to_fp32("llvm -mcpu=skylake-avx512 -mattr=-f16c,-avx512f", 49, not_match="vcvtph2ps") - fp16_to_fp32("llvm -mcpu=core-avx2", 8, match="vcvtph2ps.*ymm") - fp16_to_fp32("llvm -mcpu=core-avx2", 9, match="vcvtph2ps.*ymm") + fp16_to_fp32("llvm -mcpu=core-avx2", 8, match="vcvtph2ps.*mm") + fp16_to_fp32("llvm -mcpu=core-avx2", 9, match="vcvtph2ps.*mm") fp16_to_fp32("llvm", 9, not_match="vcvtph2ps") diff --git a/tests/scripts/task_config_build_cpu.sh b/tests/scripts/task_config_build_cpu.sh index 9ddf1778ff9f..db636063b9e3 100755 --- a/tests/scripts/task_config_build_cpu.sh +++ b/tests/scripts/task_config_build_cpu.sh @@ -30,7 +30,7 @@ echo set\(USE_GRAPH_RUNTIME_DEBUG ON\) >> config.cmake echo set\(USE_VM_PROFILER ON\) >> config.cmake echo set\(USE_DNNL_CODEGEN ON\) >> config.cmake echo set\(USE_ARM_COMPUTE_LIB ON\) >> config.cmake -echo set\(USE_LLVM llvm-config-10\) >> config.cmake +echo set\(USE_LLVM llvm-config-11\) >> config.cmake echo set\(USE_NNPACK ON\) >> config.cmake echo set\(NNPACK_PATH /NNPACK/build/\) >> config.cmake echo set\(USE_ANTLR ON\) >> config.cmake