Ninja build

CMakeLists.txt

@@ -33,7 +33,7 @@ if(NOT DEFINED LLVM_VERSION_PATCH)
   set(LLVM_VERSION_PATCH 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
-  set(LLVM_VERSION_SUFFIX git)
+  set(LLVM_VERSION_SUFFIX "")
 endif()
 
 if (NOT PACKAGE_VERSION)
@@ -842,10 +842,10 @@ configure_file(
 set(TENSORFLOW_C_LIB_PATH "" CACHE PATH "Path to TensorFlow C library install")
 find_library(tensorflow_c_api tensorflow PATHS ${TENSORFLOW_C_LIB_PATH}/lib)
 
-if (tensorflow_c_api)
-  set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available")
-  include_directories(${TENSORFLOW_C_LIB_PATH}/include)
-endif()
+# if (tensorflow_c_api)
+#   set(LLVM_HAVE_TF_API "ON" CACHE BOOL "Full Tensorflow API available")
+#   include_directories(${TENSORFLOW_C_LIB_PATH}/include)
+# endif()
 
 # Configure the three LLVM configuration header files.
 configure_file(

azure-pipelines.yml

@@ -0,0 +1,143 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- master
+
+jobs:
+- job: build_ubuntu
+  displayName: Linux Build
+  timeoutInMinutes: 0
+
+  pool:
+    vmImage: 'ubuntu-16.04'
+
+  steps:
+  - script: |
+      wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+      sudo apt-add-repository -s "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-11 main"
+      sudo apt-get update
+      sudo apt-get -y install cmake ccache ninja-build clang-11 lld-11 libllvm-11-ocaml-dev libllvm11 llvm-11 llvm-11-dev llvm-11-tools llvm-11-runtime
+    displayName: Install clang-11 and other dependencies
+
+  - script: |
+      mkdir build
+      cd build
+      CC=clang-11 CXX=clang++-11 CXXFLAGS="-msse -msse2 -mcx16" cmake .. -G Ninja -DCMAKE_INSTALL_PREFIX="" -DLLVM_CCACHE_DIR=$HOME/.ccache -DLLVM_CCACHE_BUILD=ON -DLLVM_TARGETS_TO_BUILD="X86" -DCMAKE_BUILD_TYPE=Release -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_USE_INTEL_JITEVENTS=ON -DLLVM_ENABLE_Z3_SOLVER=OFF -DCMAKE_CXX_STANDARD=17
+    displayName: Configure LLVM
+
+  - script: |
+      cd build
+      ninja
+    displayName: Build LLVM
+
+  - script: |
+      cd build
+      DESTDIR=./dest ninja install
+      cd dest
+      tar -czf llvmlibs-linux.tar.gz lib include bin
+      sha256sum ./llvmlibs-linux.tar.gz | awk '{ print $1 }' >> llvmlibs-linux.tar.gz.sha256
+    displayName: Package LLVM Libraries
+
+  - task: GitHubRelease@0
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+    inputs:
+      gitHubConnection: RPCS3-Token
+      repositoryName: RPCS3/llvm-mirror
+      action: edit # Options: create, edit, delete
+      target: '$(Build.SourceVersion)' # Required when action == Create || Action == Edit
+      tagSource: auto # Required when action == Create# Options: auto, manual
+      #tagPattern: # Optional
+      tag: 'custom-build' # Required when action == Edit || Action == Delete || TagSource == Manual
+      title: 'Linux Build' # Optional
+      #releaseNotesSource: 'file' # Optional. Options: file, input
+      #releaseNotesFile: # Optional
+      #releaseNotes: # Optional
+      assets: 'build/dest/llvmlibs-linux*' # Optional
+      assetUploadMode: delete # Optional. Options: delete, replace
+      #isDraft: false # Optional
+      #isPreRelease: true # Optional
+      #addChangeLog: true # Optional
+      #compareWith: 'lastFullRelease' # Required when addChangeLog == True. Options: lastFullRelease, lastRelease, lastReleaseByTag
+      #releaseTag: # Required when compareWith == LastReleaseByTag
+
+- job: build_win32
+  displayName: Win32 Build
+  timeoutInMinutes: 0
+
+  pool:
+    vmImage: 'windows-2019'
+
+  steps:
+  - script: |
+      choco install ninja
+    displayName: Install Ninja
+
+  - script: |
+      call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\vsdevcmd" -arch=x64
+      mkdir llvm_build
+      cd llvm_build
+      cmake -G "Ninja" .. -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DLLVM_USE_INTEL_JITEVENTS=ON -DLLVM_ENABLE_Z3_SOLVER=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=10.0 -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT
+    displayName: Configure LLVM
+
+  - script: |
+      call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\vsdevcmd" -arch=x64
+      cd llvm_build
+      cmake --build . --config Release
+      cmake --install . --config Release
+    displayName: Build LLVM
+
+  - script: |
+      mkdir llvm_out
+      cd llvm_out
+      mkdir build
+      cd build
+      mkdir llvm
+      cd llvm
+      mkdir cmake
+      mkdir include
+      mkdir tools
+      xcopy "..\..\..\cmake" ".\cmake" /E
+      xcopy "..\..\..\include" ".\include" /E
+      cd ..\
+      mkdir llvm_build
+      cd llvm_build
+      mkdir Release
+      mkdir include
+      mkdir lib
+      cd lib
+      mkdir cmake
+      cd ..\
+      xcopy "..\..\..\llvm_build\Release" ".\Release" /E
+      cd ..\
+      7z a -t7z -m0=lzma2 -mx=9 -aoa -r "llvmlibs_mt.7z" *
+    displayName: Package LLVM Libraries
+
+  - bash: |
+      cd llvm_out/build
+      sha256sum llvmlibs_mt.7z | awk '{ print $1 }' > llvmlibs_mt.7z.sha256
+    displayName: Generate sha256
+
+  - task: GitHubRelease@0
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+    inputs:
+      gitHubConnection: RPCS3-Token
+      repositoryName: RPCS3/llvm-mirror
+      action: edit # Options: create, edit, delete
+      target: '$(Build.SourceVersion)' # Required when action == Create || Action == Edit
+      tagSource: auto # Required when action == Create# Options: auto, manual
+      #tagPattern: # Optional
+      tag: 'custom-build-win' # Required when action == Edit || Action == Delete || TagSource == Manual
+      title: 'Windows Build' # Optional
+      #releaseNotesSource: 'file' # Optional. Options: file, input
+      #releaseNotesFile: # Optional
+      #releaseNotes: # Optional
+      assets: 'llvm_out/build/llvmlibs_mt.*' # Optional
+      assetUploadMode: delete # Optional. Options: delete, replace
+      #isDraft: false # Optional
+      #isPreRelease: true # Optional
+      #addChangeLog: true # Optional
+      #compareWith: 'lastFullRelease' # Required when addChangeLog == True. Options: lastFullRelease, lastRelease, lastReleaseByTag
+      #releaseTag: # Required when compareWith == LastReleaseByTag

cmake/modules/HandleLLVMOptions.cmake

@@ -12,6 +12,7 @@ include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
+include(LLVMProcessSources)
 
 if(CMAKE_LINKER MATCHES "lld-link" OR (MSVC AND (LLVM_USE_LINKER STREQUAL "lld" OR LLVM_ENABLE_LLD)))
   set(LINKER_IS_LLD_LINK TRUE)
@@ -291,6 +292,15 @@ if( LLVM_ENABLE_PIC )
          NOT Uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
     add_flag_or_print_warning("-fno-shrink-wrap" FNO_SHRINK_WRAP)
   endif()
+  # gcc with -O3 -fPIC generates TLS sequences that violate the spec on
+  # Solaris/sparcv9, causing executables created with the system linker
+  # to SEGV (GCC PR target/96607).
+  # clang with -O3 -fPIC generates code that SEGVs.
+  # Both can be worked around by compiling with -O instead.
+  if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS" AND LLVM_NATIVE_ARCH STREQUAL "Sparc")
+    llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O[23]" "-O")
+    llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O[23]" "-O")
+  endif()
 endif()
 
 if(NOT WIN32 AND NOT CYGWIN AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))

cmake/modules/LLVMConfig.cmake.in

@@ -7,6 +7,7 @@ set(LLVM_VERSION_MINOR @LLVM_VERSION_MINOR@)
 set(LLVM_VERSION_PATCH @LLVM_VERSION_PATCH@)
 set(LLVM_VERSION_SUFFIX @LLVM_VERSION_SUFFIX@)
 set(LLVM_PACKAGE_VERSION @PACKAGE_VERSION@)
+set(LLVM_PACKAGE_BUGREPORT @PACKAGE_BUGREPORT@)
 
 set(LLVM_BUILD_TYPE @CMAKE_BUILD_TYPE@)