From 51d37fa62440cdc1846b890b2a64a84c1d855eec Mon Sep 17 00:00:00 2001
From: cf_zhao <zhaochuanfeng@huawei.com>
Date: Fri, 12 Jan 2024 15:02:04 +0800
Subject: [PATCH 1/2] Add build script to the project.

---
 build.sh | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100755 build.sh

diff --git a/build.sh b/build.sh
new file mode 100755
index 000000000000..7b6b7908abbd
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,198 @@
+#!/bin/bash
+
+# Tools to use for bootstrapping.
+C_COMPILER_PATH=gcc
+CXX_COMPILER_PATH=g++
+
+# Initialize our own variables:
+buildtype=RelWithDebInfo
+backends="ARM;AArch64;X86"
+enabled_projects="clang;lld;compiler-rt;openmp;clang-tools-extra"
+embedded_toolchain="0"
+split_dwarf=on
+use_ccache="0"
+do_install="0"
+clean=0
+unit_test=""
+install="install"
+install_toolchain_only="0"
+verbose=""
+dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+build_dir_name="build"
+install_dir_name="install"
+build_prefix="$dir/$build_dir_name"
+install_prefix="$dir/$install_dir_name"
+
+# Use 8 threads for builds and tests by default. Use more threads if possible,
+# but avoid overloading the system by using up to 50% of available cores.
+threads=8
+nproc=$(type -p nproc)
+if [ -x "$nproc" -a -f /proc/loadavg ]; then
+  loadavg=$(awk '{printf "%.0f\n", $1}' < /proc/loadavg)
+  let threads="($($nproc) - $loadavg) / 2"
+  if [ $threads -le 0 ]; then
+    threads=1
+  fi
+fi
+
+# Exit script on first error.
+set -e
+
+usage() {
+  cat <<EOF
+Usage: $0 [options]
+
+Build the compiler under $build_prefix, then install under $install_prefix.
+
+Options:
+  -b type  Specify CMake build type (default: $buildtype).
+  -c       Use ccache (default: $use_ccache).
+  -e       Build for embedded cross tool chain.
+  -h       Display this help message.
+  -i       Install the build (default: $do_install).
+  -I name  Specify install directory name (default: "$install_dir_name").
+  -j N     Allow N jobs at once (default: $threads).
+  -o       Enable LLVM_INSTALL_TOOLCHAIN_ONLY=ON.
+  -r       Delete $install_prefix and perform a clean build (default: incremental).
+  -s       Strip binaries and minimize file permissions when (re-)installing.
+  -t       Enable unit tests for components that support them (make check-all).
+  -v       Enable verbose build output (default: quiet).
+  -X archs Build only the specified semi-colon-delimited list of backends (default: "$backends").
+EOF
+}
+
+# Process command-line options. Remember the options for passing to the
+# containerized build script.
+while getopts :b:cehiI:j:orstvX: optchr; do
+  case "$optchr" in
+    b)
+      buildtype="$OPTARG"
+      case "${buildtype,,}" in
+        release)
+          split_dwarf=off
+          ;;
+        debug|relwithdebinfo)
+          ;;
+        *)
+          echo "$0: invalid build type '$buildtype'"
+          exit 1
+          ;;
+      esac
+      ;;
+    c)
+      use_ccache="1"
+      ;;
+    e)
+      embedded_toolchain="1"
+      ;;
+    h)
+      usage
+      exit
+      ;;
+    i)
+      do_install="1"
+      ;;
+    I)
+      install_dir_name="$OPTARG"
+      install_prefix="$dir/$install_dir_name"
+      ;;
+    j)
+      threads="$OPTARG"
+      ;;
+    o)
+      install_toolchain_only=1
+      ;;
+    r)
+      clean=1
+      ;;
+    s)
+      install="install/strip"
+      ;;
+    t)
+      unit_test=check-all
+      ;;
+    v)
+      verbose="VERBOSE=1"
+      ;;
+    X)
+      backends="$OPTARG"
+      ;;
+    :)
+      echo "$0: missing argument for option '-$OPTARG'"
+      exit 1
+      ;;
+    ?)
+      echo "$0: invalid option '-$OPTARG'"
+      exit 1
+      ;;
+  esac
+done
+
+CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=$install_prefix \
+               -DCMAKE_BUILD_TYPE=$buildtype \
+               -DCMAKE_C_COMPILER=$C_COMPILER_PATH \
+               -DCMAKE_CXX_COMPILER=$CXX_COMPILER_PATH \
+               -DLLVM_TARGETS_TO_BUILD=$backends "
+
+# Warning: the -DLLVM_ENABLE_PROJECTS option is specified with cmake
+# to avoid issues with nested quotation marks
+if [ $use_ccache == "1" ]; then
+  echo "Build using ccache"
+  CMAKE_OPTIONS="$CMAKE_OPTIONS \
+                -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+                -DCMAKE_CXX_COMPILER_LAUNCHER=ccache "
+fi
+
+if [ $embedded_toolchain == "1" ]; then
+  echo "Build for embedded cross tool chain"
+  enabled_projects="clang;lld;compiler-rt;"
+fi
+
+# When set LLVM_INSTALL_TOOLCHAIN_ONLY to On it removes many of the LLVM development
+# and testing tools as well as component libraries from the default install target.
+if [ $install_toolchain_only == "1" ]; then
+  echo "Only install toolchain"
+  CMAKE_OPTIONS="$CMAKE_OPTIONS -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON"
+fi
+
+# Build and install
+if [ $clean -eq 1 -a -e "$install_prefix" ]; then
+  rm -rf "$install_prefix"
+fi
+mkdir -p "$install_prefix/bin"
+
+if [ $clean -eq 1 -a -e "$build_prefix" ]; then
+  rm -rf "$build_prefix"
+fi
+
+mkdir -p "$build_prefix" && cd "$build_prefix"
+cmake $CMAKE_OPTIONS \
+      -DCOMPILER_RT_BUILD_SANITIZERS=on \
+      -DLLVM_ENABLE_PROJECTS=$enabled_projects \
+      -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
+      -DLLVM_USE_LINKER=gold \
+      -DLLVM_LIT_ARGS="-sv -j$threads" \
+      -DLLVM_USE_SPLIT_DWARF=$split_dwarf \
+      -DCMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO="-Wl,--gdb-index -Wl,--compress-debug-sections=zlib"\
+      -DCMAKE_EXE_LINKER_FLAGS_DEBUG="-Wl,--gdb-index -Wl,--compress-debug-sections=zlib" \
+      $verbose \
+      ../llvm
+
+make -j$threads
+if [ $do_install == "1" ]; then
+  make -j$threads $verbose $install
+fi
+
+if [ -n "$unit_test" ]; then
+  make -j$threads $verbose check-all
+fi
+
+cd ..
+
+# When building official deliverables, minimize file permissions under the
+# installation directory.
+if [ "$install" = "install/strip" ]; then
+  find $install_prefix -type f -exec chmod a-w,o-rx {} \;
+fi
+
+echo "$0: SUCCESS"
-- 
Gitee


From d8b1bb9a60a2851b7cea0fb68c375e32ade9c559 Mon Sep 17 00:00:00 2001
From: cf_zhao <zhaochuanfeng@huawei.com>
Date: Sat, 13 Jan 2024 12:27:35 +0800
Subject: [PATCH 2/2] [test] Disable several cases which failed on Aarch64
 platform

---
 compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp | 1 +
 compiler-rt/test/lsan/TestCases/malloc_zero.c           | 1 +
 compiler-rt/test/lsan/TestCases/realloc_too_big.c       | 1 +
 openmp/runtime/test/ompt/synchronization/masked.c       | 1 +
 openmp/runtime/test/ompt/synchronization/master.c       | 1 +
 5 files changed, 5 insertions(+)

diff --git a/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp b/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp
index 2f824a195d17..3bce11e6a4b6 100644
--- a/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp
+++ b/compiler-rt/test/lsan/TestCases/Linux/log-path_test.cpp
@@ -13,6 +13,7 @@
 // RUN: cat %device_rundir/%t.log.* >> %t.log
 // RUN: %adb_shell 'cat %device_rundir/%t.log.*' >> %t.log
 // RUN: FileCheck %s --check-prefix=CHECK-ERROR < %t.log.*
+// REQUIRES: x86_64
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/compiler-rt/test/lsan/TestCases/malloc_zero.c b/compiler-rt/test/lsan/TestCases/malloc_zero.c
index 5c8d1850a0f9..d6d2db6a62c0 100644
--- a/compiler-rt/test/lsan/TestCases/malloc_zero.c
+++ b/compiler-rt/test/lsan/TestCases/malloc_zero.c
@@ -3,6 +3,7 @@
 
 /// Fails when only leak sanitizer is enabled
 // UNSUPPORTED: arm-linux, armhf-linux
+// REQUIRES: x86_64
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/compiler-rt/test/lsan/TestCases/realloc_too_big.c b/compiler-rt/test/lsan/TestCases/realloc_too_big.c
index 1a6569b083dc..9c0b1304a0c3 100644
--- a/compiler-rt/test/lsan/TestCases/realloc_too_big.c
+++ b/compiler-rt/test/lsan/TestCases/realloc_too_big.c
@@ -3,6 +3,7 @@
 
 /// Fails when only leak sanitizer is enabled
 // UNSUPPORTED: arm-linux, armhf-linux
+// REQUIRES: x86_64
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/openmp/runtime/test/ompt/synchronization/masked.c b/openmp/runtime/test/ompt/synchronization/masked.c
index 3eb45d9592d8..56821492492c 100644
--- a/openmp/runtime/test/ompt/synchronization/masked.c
+++ b/openmp/runtime/test/ompt/synchronization/masked.c
@@ -2,6 +2,7 @@
 // REQUIRES: ompt
 // GCC generates code that does not call the runtime for the master construct
 // XFAIL: gcc
+// REQUIRES: x86_64
 
 #include "callback.h"
 #include <omp.h>
diff --git a/openmp/runtime/test/ompt/synchronization/master.c b/openmp/runtime/test/ompt/synchronization/master.c
index 34ecc522b85f..60abce891219 100644
--- a/openmp/runtime/test/ompt/synchronization/master.c
+++ b/openmp/runtime/test/ompt/synchronization/master.c
@@ -2,6 +2,7 @@
 // REQUIRES: ompt
 // GCC generates code that does not call the runtime for the master construct
 // XFAIL: gcc
+// REQUIRES: x86_64
 
 #define USE_PRIVATE_TOOL 1
 #include "callback.h"
-- 
Gitee