Merge pull request #5102 from kinke/llvm22

Bump LDC-LLVM to v22.1.2

Author: kinke

.github/actions/1-setup/action.yml

@@ -26,7 +26,7 @@ runs:
         packages=( \
           git-core cmake g++ \
           libcurl4 libzstd-dev \
-          curl gdb p7zip-full tzdata unzip zip python3-pip \
+          curl gdb p7zip-full zstd tzdata unzip zip python3-pip \
         )
         if [[ $arch == x86_64 ]]; then
           packages+=(g++-multilib libcurl4:i386)
@@ -71,7 +71,7 @@ runs:
       run: |
         set -eux
         cd ..
-        version='${{ inputs.clang_major }}.1.8'
+        version='${{ inputs.clang_major }}.1.2'
         curl -fL --retry 3 --max-time 300 -o clang.exe \
           https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/LLVM-$version-win64.exe
         ./clang.exe //S # double-slash for bash
@@ -115,11 +115,11 @@ runs:
           elif [[ '${{ runner.os }}' == macOS ]]; then
             os=osx
           fi
-          curl -fL --retry 3 --max-time 300 -o llvm.tar.xz \
-            https://github.com/ldc-developers/llvm-project/releases/download/$tag/llvm-$version-$os-$arch$assertsSuffix.tar.xz
+          curl -fL --retry 3 --max-time 300 -o llvm.tar.zst \
+            https://github.com/ldc-developers/llvm-project/releases/download/$tag/llvm-$version-$os-$arch$assertsSuffix.tar.zst
           mkdir llvm
-          tar -xf llvm.tar.xz --strip 1 -C llvm
-          rm llvm.tar.xz
+          tar -xf llvm.tar.zst --zstd --strip 1 -C llvm
+          rm llvm.tar.zst
         fi
 
         llvm/bin/llvm-config --version

.github/actions/3-build-cross/action.yml

@@ -45,11 +45,11 @@ runs:
           fi
         fi
 
-        curl -fL --retry 3 --max-time 300 -o llvm-cross.tar.xz \
-          https://github.com/ldc-developers/llvm-project/releases/download/$tag/llvm-$version-${{ inputs.os }}-${{ inputs.arch }}$assertsSuffix.tar.xz
+        curl -fL --retry 3 --max-time 300 -o llvm-cross.tar.zst \
+          https://github.com/ldc-developers/llvm-project/releases/download/$tag/llvm-$version-${{ inputs.os }}-${{ inputs.arch }}$assertsSuffix.tar.zst
         mkdir llvm-cross
-        tar -xf llvm-cross.tar.xz --strip 1 -C llvm-cross
-        rm llvm-cross.tar.xz
+        tar -xf llvm-cross.tar.zst --zstd --strip 1 -C llvm-cross
+        rm llvm-cross.tar.zst
 
     - name: Make non-native llvm-config runnable on host
       shell: bash

.github/actions/3-build-cross/android-llvm-config.in

@@ -43,15 +43,15 @@ Typical components:
 version=@LLVM_VERSION@
 prefix=@LLVM_INSTALL_DIR@
 has_rtti=NO
-CPPFLAGS="-I${prefix}/include -DEXPERIMENTAL_KEY_INSTRUCTIONS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
+CPPFLAGS="-I${prefix}/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
 CFLAGS="${CPPFLAGS} ${CFLAGS}"
 CXXFLAGS="${CFLAGS} -std=c++17 --stdlib=libc++ -fno-exceptions -funwind-tables"
 if [ "$has_rtti" != "YES" ]; then CXXFLAGS="$CXXFLAGS -fno-rtti"; fi
 LDFLAGS="-L${prefix}/lib"
 LIBFILE="${prefix}/lib/libLLVM-$version.so"
 
-components="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitstreamreader bitwriter cfguard cgdata codegen codegentypes core coroutines coverage debuginfobtf debuginfocodeview debuginfodwarf debuginfodwarflowlevel debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarfcfichecker dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontendatomic frontenddirective frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mirparser native nativecodegen objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes profiledata remarks runtimedyld sandboxir scalaropts selectiondag spirv spirvanalysis spirvcodegen spirvdesc spirvinfo support symbolize tablegen target targetparser telemetry textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray"
-static_libs="-lLLVMWindowsManifest -lLLVMXRay -lLLVMLibDriver -lLLVMDlltoolDriver -lLLVMTelemetry -lLLVMTextAPIBinaryReader -lLLVMCoverage -lLLVMLineEditor -lLLVMX86TargetMCA -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMWebAssemblyDisassembler -lLLVMWebAssemblyAsmParser -lLLVMWebAssemblyCodeGen -lLLVMWebAssemblyUtils -lLLVMWebAssemblyDesc -lLLVMWebAssemblyInfo -lLLVMSPIRVCodeGen -lLLVMSPIRVDesc -lLLVMSPIRVInfo -lLLVMSPIRVAnalysis -lLLVMARMDisassembler -lLLVMARMAsmParser -lLLVMARMCodeGen -lLLVMARMDesc -lLLVMARMUtils -lLLVMARMInfo -lLLVMAArch64Disassembler -lLLVMAArch64AsmParser -lLLVMAArch64CodeGen -lLLVMAArch64Desc -lLLVMAArch64Utils -lLLVMAArch64Info -lLLVMOrcDebugging -lLLVMOrcJIT -lLLVMWindowsDriver -lLLVMMCJIT -lLLVMJITLink -lLLVMInterpreter -lLLVMExecutionEngine -lLLVMRuntimeDyld -lLLVMOrcTargetProcess -lLLVMOrcShared -lLLVMDWP -lLLVMDWARFCFIChecker -lLLVMDebugInfoLogicalView -lLLVMOption -lLLVMObjCopy -lLLVMMCA -lLLVMMCDisassembler -lLLVMLTO -lLLVMPasses -lLLVMHipStdPar -lLLVMCFGuard -lLLVMCoroutines -lLLVMipo -lLLVMVectorize -lLLVMSandboxIR -lLLVMLinker -lLLVMFrontendOpenMP -lLLVMFrontendOffloading -lLLVMObjectYAML -lLLVMFrontendOpenACC -lLLVMFrontendHLSL -lLLVMFrontendDriver -lLLVMInstrumentation -lLLVMFrontendDirective -lLLVMFrontendAtomic -lLLVMExtensions -lLLVMDWARFLinkerParallel -lLLVMDWARFLinkerClassic -lLLVMDWARFLinker -lLLVMGlobalISel -lLLVMMIRParser -lLLVMAsmPrinter -lLLVMSelectionDAG -lLLVMCodeGen -lLLVMTarget -lLLVMObjCARCOpts -lLLVMCodeGenTypes -lLLVMCGData -lLLVMIRPrinter -lLLVMInterfaceStub -lLLVMFileCheck -lLLVMFuzzMutate -lLLVMScalarOpts -lLLVMInstCombine -lLLVMAggressiveInstCombine -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMSymbolize -lLLVMDebugInfoBTF -lLLVMDebugInfoPDB -lLLVMDebugInfoMSF -lLLVMDebugInfoCodeView -lLLVMDebugInfoGSYM -lLLVMDebugInfoDWARF -lLLVMDebugInfoDWARFLowLevel -lLLVMObject -lLLVMTextAPI -lLLVMMCParser -lLLVMIRReader -lLLVMAsmParser -lLLVMMC -lLLVMBitReader -lLLVMFuzzerCLI -lLLVMCore -lLLVMRemarks -lLLVMBitstreamReader -lLLVMBinaryFormat -lLLVMTargetParser -lLLVMTableGen -lLLVMSupport -lLLVMDemangle"
+components="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils abi aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter binaryformat bitreader bitstreamreader bitwriter cas cfguard cgdata codegen codegentypes core coroutines coverage debuginfobtf debuginfocodeview debuginfodwarf debuginfodwarflowlevel debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dtlto dwarfcfichecker dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontendatomic frontenddirective frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mirparser native nativecodegen objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes plugins profiledata remarks runtimedyld sandboxir scalaropts selectiondag spirv spirvanalysis spirvcodegen spirvdesc spirvinfo support supportlsp symbolize tablegen target targetparser telemetry textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray"
+static_libs="-lLLVMWindowsManifest -lLLVMXRay -lLLVMLibDriver -lLLVMDlltoolDriver -lLLVMTelemetry -lLLVMTextAPIBinaryReader -lLLVMCoverage -lLLVMLineEditor -lLLVMX86TargetMCA -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMWebAssemblyDisassembler -lLLVMWebAssemblyAsmParser -lLLVMWebAssemblyCodeGen -lLLVMWebAssemblyUtils -lLLVMWebAssemblyDesc -lLLVMWebAssemblyInfo -lLLVMSPIRVCodeGen -lLLVMSPIRVDesc -lLLVMSPIRVInfo -lLLVMSPIRVAnalysis -lLLVMARMDisassembler -lLLVMARMAsmParser -lLLVMARMCodeGen -lLLVMARMDesc -lLLVMARMUtils -lLLVMARMInfo -lLLVMAArch64Disassembler -lLLVMAArch64AsmParser -lLLVMAArch64CodeGen -lLLVMAArch64Desc -lLLVMAArch64Utils -lLLVMAArch64Info -lLLVMOrcDebugging -lLLVMOrcJIT -lLLVMWindowsDriver -lLLVMMCJIT -lLLVMJITLink -lLLVMInterpreter -lLLVMExecutionEngine -lLLVMRuntimeDyld -lLLVMOrcTargetProcess -lLLVMOrcShared -lLLVMDWP -lLLVMDWARFCFIChecker -lLLVMDebugInfoLogicalView -lLLVMOption -lLLVMObjCopy -lLLVMMCA -lLLVMMCDisassembler -lLLVMDTLTO -lLLVMLTO -lLLVMPlugins -lLLVMPasses -lLLVMHipStdPar -lLLVMCFGuard -lLLVMCoroutines -lLLVMipo -lLLVMVectorize -lLLVMSandboxIR -lLLVMLinker -lLLVMFrontendOpenMP -lLLVMFrontendOffloading -lLLVMObjectYAML -lLLVMFrontendOpenACC -lLLVMFrontendDriver -lLLVMInstrumentation -lLLVMFrontendDirective -lLLVMFrontendAtomic -lLLVMExtensions -lLLVMDWARFLinkerParallel -lLLVMDWARFLinkerClassic -lLLVMDWARFLinker -lLLVMGlobalISel -lLLVMMIRParser -lLLVMAsmPrinter -lLLVMSelectionDAG -lLLVMCodeGen -lLLVMTarget -lLLVMObjCARCOpts -lLLVMCodeGenTypes -lLLVMCGData -lLLVMCAS -lLLVMIRPrinter -lLLVMInterfaceStub -lLLVMFileCheck -lLLVMFuzzMutate -lLLVMScalarOpts -lLLVMInstCombine -lLLVMAggressiveInstCombine -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMSymbolize -lLLVMDebugInfoBTF -lLLVMDebugInfoPDB -lLLVMDebugInfoMSF -lLLVMDebugInfoCodeView -lLLVMDebugInfoGSYM -lLLVMDebugInfoDWARF -lLLVMObject -lLLVMTextAPI -lLLVMMCParser -lLLVMIRReader -lLLVMAsmParser -lLLVMMC -lLLVMDebugInfoDWARFLowLevel -lLLVMBitReader -lLLVMFrontendHLSL -lLLVMFuzzerCLI -lLLVMABI -lLLVMCore -lLLVMRemarks -lLLVMBitstreamReader -lLLVMBinaryFormat -lLLVMTargetParser -lLLVMTableGen -lLLVMSupportLSP -lLLVMSupport -lLLVMDemangle"
 shared_libs="-lLLVM-$version"
 libs=$static_libs
 handle_args () {

.github/workflows/main.yml

@@ -14,8 +14,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  LLVM_VERSION: 21.1.8
-  CLANG_MAJOR: 21
+  LLVM_VERSION: 22.1.2
+  CLANG_MAJOR: 22
 
 jobs:
   build-native:

.github/workflows/supported_llvm_versions.yml

@@ -19,6 +19,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - job_name: macOS 14, LLVM 21, latest LDC beta
+            os: macos-14
+            host_dc: ldc-beta
+            llvm_version: 21
+            cmake_flags: -DBUILD_SHARED_LIBS=OFF -DRT_SUPPORT_SANITIZERS=ON
           - job_name: Ubuntu 24.04, LLVM 20, bootstrap LDC
             os: ubuntu-24.04
             host_dc: ldc-1.19.0

CHANGELOG.md

@@ -1,11 +1,12 @@
 # LDC master
 
 #### Big news
+- Support for [LLVM 22](https://releases.llvm.org/22.1.0/docs/ReleaseNotes.html). The prebuilt packages use v22.1.2. (#5097, #5102)
 - Minimum LLVM version raised to 18. (#5094)
 - Predefined version `LDC_LLVM_*` now only contains the LLVM major version, i.e., former `version (LDC_LLVM_1801)` with LLVM v18.1 is now `version (LDC_LLVM_18)`. Use `ldc.intrinsics.LLVM_version` for backwards compatibility if really needed. (#5109)
 
 #### Platform support
-- Supports LLVM 18 - 21.
+- Supports LLVM 18 - 22.
 
 #### Bug fixes
 

CMakeLists.txt

@@ -562,19 +562,17 @@ if(MSVC)
     endif()
 endif()
 if(LDC_WITH_LLD)
-    if(MSVC)
-        list(APPEND LDC_LINKERFLAG_LIST LLVMSymbolize.lib)
-    else()
-        set(LDC_LINKERFLAG_LIST -lLLVMSymbolize ${LDC_LINKERFLAG_LIST})
+    if(LLVM_VERSION_MAJOR GREATER 21)
+        if(MSVC)
+            list(APPEND LDC_LINKERFLAG_LIST LLVMDTLTO.lib)
+        else()
+            set(LDC_LINKERFLAG_LIST -lLLVMDTLTO ${LDC_LINKERFLAG_LIST})
+        endif()
     endif()
     if(MSVC)
-        list(APPEND LDC_LINKERFLAG_LIST lldMinGW.lib lldCOFF.lib lldELF.lib lldMachO.lib lldWasm.lib lldCommon.lib)
+        list(APPEND LDC_LINKERFLAG_LIST lldMinGW.lib lldCOFF.lib lldELF.lib lldMachO.lib lldWasm.lib lldCommon.lib LLVMSymbolize.lib)
     else()
-        set(LDC_LINKERFLAG_LIST -llldMinGW -llldCOFF -llldELF -llldMachO -llldWasm -llldCommon ${LDC_LINKERFLAG_LIST})
-    endif()
-    if(APPLE)
-        # LLD 13.0.0 on Mac needs libxar
-        list(APPEND LDC_LINKERFLAG_LIST -lxar)
+        set(LDC_LINKERFLAG_LIST -llldMinGW -llldCOFF -llldELF -llldMachO -llldWasm -llldCommon -lLLVMSymbolize ${LDC_LINKERFLAG_LIST})
     endif()
     if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
         # FreeBSD LLVM port links to zstd, but does not convey this information via CMake

driver/cl_options.cpp

@@ -856,7 +856,8 @@ void hideLLVMOptions() {
       "amdgpu-enable-global-sgpr-addr", "amdgpu-enable-merge-m0",
       "amdgpu-enable-power-sched", "amdgpu-igrouplp",
       "amdgpu-indirect-call-specialization-threshold",
-      "amdgpu-kernarg-preload-count", "amdgpu-module-splitting-max-depth",
+      "amdgpu-kernarg-preload", "amdgpu-kernarg-preload-count",
+      "amdgpu-module-splitting-max-depth",
       "amdgpu-promote-alloca-to-vector-limit",
       "amdgpu-promote-alloca-to-vector-max-regs",
       "amdgpu-promote-alloca-to-vector-vgpr-ratio",
@@ -866,28 +867,33 @@ void hideLLVMOptions() {
       "argext-abi-check", "arm-add-build-attributes",
       "arm-implicit-it", "asm-instrumentation", "asm-show-inst",
       "atomic-counter-update-promoted", "atomic-first-counter",
-      "basic-block-address-map", "basic-block-sections",
+      "basic-block-address-map", "basic-block-section-match-infer",
+      "basic-block-sections",
       "basicblock-sections", "bounds-checking-single-trap",
-      "bounds-checking-unique-traps", "bpf-stack-size", "cfg-hide-cold-paths",
+      "bounds-checking-unique-traps", "bpf-stack-size",
+      "call-graph-section", "cfg-hide-cold-paths",
       "cfg-hide-deoptimize-paths", "cfg-hide-unreachable-paths",
       "check-functions-filter", "code-model", "conditional-counter-update",
       "cost-kind", "cppfname", "cppfor", "cppgen", "crel",
       "ctx-profile-force-is-specialized", "cvp-dont-add-nowrap-flags",
       "cvp-dont-process-adds", "debug-counter", "debug-entry-values",
       "debugger-tune", "debugify-atoms", "debugify-func-limit",
       "debugify-level", "debugify-quiet", "debug-info-correlate",
-      "denormal-fp-math", "denormal-fp-math-f32",
+      "denormal-fp-math", "denormal-fp-math-f32", "devirtualize-speculatively",
       "disable-auto-upgrade-debug-info", "disable-debug-info-verifier",
       "disable-i2p-p2i-opt",
       "disable-objc-arc-checkforcfghazards", "disable-promote-alloca-to-lds",
-      "disable-promote-alloca-to-vector", "disable-slp-vectorization",
+      "disable-promote-alloca-to-vector", "disable-qfp-opt",
+      "disable-qfp-opt-mul", "disable-slp-vectorization",
       "disable-spill-fusing",
-      "do-counter-promotion", "dot-cfg-mssa", "dwarf64", "emit-call-site-info",
+      "do-counter-promotion", "dot-cfg-mssa", "dwarf64",
+      "elide-all-zero-branch-weights", "emit-bb-hash", "emit-call-site-info",
       "emit-compact-unwind-non-canonical", "emit-dwarf-unwind",
       "emit-gnuas-syntax-on-zos", "emscripten-cxx-exceptions-allowed",
       "emscripten-cxx-exceptions-whitelist",
       "emulated-tls", "enable-approx-func-fp-math", "enable-correct-eh-support",
       "enable-cse-in-irtranslator", "enable-cse-in-legalizer",
+      "enable-devirtualize-speculatively",
       "enable-emscripten-cxx-exceptions", "enable-emscripten-sjlj",
       "enable-fp-mad", "enable-gvn-hoist", "enable-gvn-memdep",
       "enable-gvn-memoryssa",
@@ -898,7 +904,8 @@ void hideLLVMOptions() {
       "enable-no-nans-fp-math", "enable-no-signed-zeros-fp-math",
       "enable-no-trapping-fp-math", "enable-objc-arc-annotations",
       "enable-objc-arc-opts", "enable-pgo-force-function-attrs",
-      "enable-pie", "enable-scoped-noalias",
+      "enable-pie", "enable-poison-reuse-guard",
+      "enable-scoped-noalias",
       "enable-split-backedge-in-load-pre", "enable-split-loopiv-heuristic",
       "enable-tbaa", "enable-tlsdesc", "enable-unsafe-fp-math",
       "enable-vtable-profile-use", "enable-vtable-value-profiling",
@@ -910,8 +917,8 @@ void hideLLVMOptions() {
       "force-dwarf-frame-section", "force-opaque-pointers",
       "force-tail-folding-style",
       "fs-profile-debug-bw-threshold", "fs-profile-debug-prob-diff-threshold",
-      "generate-merged-base-profiles",
-      "gpsize", "hash-based-counter-split", "hexagon-add-build-attributes",
+      "generate-merged-base-profiles", "gpsize", "gsframe",
+      "hash-based-counter-split", "hexagon-add-build-attributes",
       "hexagon-rdf-limit", "hot-cold-split", "hwasan-percentile-cutoff-hot",
       "hwasan-random-rate", "ignore-xcoff-visibility",
       "imp-null-check-page-size", "imp-null-max-insts-to-consider",
@@ -923,7 +930,8 @@ void hideLLVMOptions() {
       "instcombine-negator-max-depth", "instcombine-unsafe-select-transform",
       "instrprof-atomic-counter-update-all", "internalize-public-api-file",
       "internalize-public-api-list", "intrinsic-cost-strategy",
-      "ir2vec-arg-weight", "ir2vec-opc-weight", "ir2vec-type-weight",
+      "ir2vec-arg-weight", "ir2vec-kind", "ir2vec-opc-weight",
+      "ir2vec-type-weight",
       "ir2vec-vocab-path", "iterative-counter-promotion",
       "join-liveintervals", "jump-table-type", "large-data-threshold",
       "limit-float-precision", "lint-abort-on-error", "loongarch-use-aa",
@@ -936,7 +944,10 @@ void hideLLVMOptions() {
       "memop-size-large", "memop-size-range", "merror-missing-parenthesis",
       "merror-noncontigious-register", "mfuture-regs", "mhvx",
       "mips-compact-branches", "mips16-constant-islands", "mips16-hard-float",
-      "mir-strip-debugify-only", "misexpect-tolerance", "mlsm", "mno-compound",
+      "mir-strip-debugify-only",
+      "mir2vec-common-operand-weight", "mir2vec-kind", "mir2vec-opc-weight",
+      "mir2vec-reg-operand-weight", "mir2vec-vocab-path",
+      "misexpect-tolerance", "mlsm", "mno-compound",
       "mno-fixup", "mno-ldc1-sdc1", "mno-pairing",
       "ms-secure-hotpatch-functions-file", "ms-secure-hotpatch-functions-list",
       "mwarn-missing-parenthesis",
@@ -952,10 +963,15 @@ void hideLLVMOptions() {
       "polly-dump-after", "polly-dump-after-file", "polly-dump-before",
       "polly-dump-before-file", "pre-RA-sched", "print-after-all",
       "print-before-all", "print-machineinstrs", "print-module-scope",
-      "print-pipeline-passes", "profile-correlate",
+      "print-pipeline-passes",
+      "profcheck-annotate-select", "profcheck-default-function-entry-count",
+      "profcheck-default-select-false-weight",
+      "profcheck-default-select-true-weight", "profcheck-weights-for-test",
+      "profile-correlate",
       "profile-estimator-loop-weight", "profile-estimator-loop-weight",
       "profile-file", "profile-info-file", "profile-verifier-noassert",
-      "promote-alloca-vector-loop-user-weight", "pseudo-probe-for-profiling",
+      "promote-alloca-vector-loop-user-weight", "propeller-infer-threshold",
+      "pseudo-probe-for-profiling",
       "r600-ir-structurize", "rdf-dump", "rdf-limit", "recip", "regalloc",
       "relax-elf-relocations", "remarks-section", "rewrite-map-file",
       "riscv-add-build-attributes", "riscv-use-aa", "rng-seed",
@@ -970,11 +986,12 @@ void hideLLVMOptions() {
       "skip-ret-exit-block",
       "speculative-counter-promotion-max-exiting",
       "speculative-counter-promotion-to-loop", "spiller", "spirv-debug",
+      "spirv-emit-op-names",
       "spirv-erase-cl-md", "spirv-ext", "spirv-lower-const-expr",
       "spirv-mem2reg",
       "spirv-no-deref-attr", "spirv-text", "spirv-verify-regularize-passes",
-      "split-machine-functions", "spv-dump-deps",
-      "spv-emit-nonsemantic-debug-info",
+      "split-machine-functions", "spv-allow-unknown-intrinsics",
+      "spv-dump-deps", "spv-emit-nonsemantic-debug-info",
       "spv-lower-saddwithoverflow-validate", "spvbool-validate",
       "spvmemmove-validate", "stack-alignment", "stack-protector-guard",
       "stack-protector-guard-offset", "stack-protector-guard-reg",