devel/llvm-devel: Update to new snapshot

Enable COMPILER_RT on RISC-V. [0]

PR:		263051 [0]
Submitted by:	pkubaj [0]

5 files changed, 97 insertions, 19 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 59c604315738..8d8de930e670 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -68,9 +68,7 @@ CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DLLVM_ENABLE_LIBXML2=OFF
 CMAKE_ARGS+=	-DLLVM_ENABLE_LIBEDIT=OFF
-CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
-		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
-		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}m.so
+CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD}
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
@@ -92,7 +90,7 @@ OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc=	GOLD
 OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
 OPTIONS_DEFINE_powerpc64le=	GOLD OPENMP
-OPTIONS_DEFINE_riscv64=	OPENMP
+OPTIONS_DEFINE_riscv64=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT+=	EXTRAS FLANG LIT LLDB MLIR STATIC_LIBS
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
@@ -101,7 +99,7 @@ OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
 OPTIONS_DEFAULT_powerpc64_13=	GOLD
 OPTIONS_DEFAULT_powerpc64_14=	GOLD
 OPTIONS_DEFAULT_powerpc64le=	GOLD OPENMP
-OPTIONS_DEFAULT_riscv64=	OPENMP
+OPTIONS_DEFAULT_riscv64=	COMPILER_RT OPENMP
 OPTIONS_EXCLUDE_i386=	FLANG
 OPTIONS_EXCLUDE_powerpc=	FLANG
 OPTIONS_EXCLUDE_riscv64=	LLDB
@@ -117,8 +115,7 @@ PLIST_FILES=
 PLIST_SUB_SED_EXCLUDE_VAL=	lib "3.0.0"
 
 CLANG_DESC=	Build clang
-CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \
-			-DCLANG_LINK_LLVM_DYLIB=ON
+CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
 CLANG_PORTDOCS=		clang
 CLANG_PLIST_FILES=	share/toolchains/llvm-devel.mk
 CLANG_SUB_FILES=	xtoolchain.mk
@@ -215,6 +212,7 @@ MAN1SRCS+=	bugpoint.1 \
 		llvm-ranlib.1 \
 		llvm-readelf.1 \
 		llvm-readobj.1 \
+		llvm-remark-size-diff.1 \
 		llvm-size.1 \
 		llvm-stress.1 \
 		llvm-strings.1 \
@@ -356,7 +354,6 @@ STRIP=
 
 _CRTLIBDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd
 _CRTBLDIR=	${LLVM_DIR}/lib/clang/%%LLVM_RELEASE%%/share
-_COMPILER_RT_IGNORELISTS=	cfi_ignorelist.txt
 _COMPILER_RT_LIBS_i386= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
@@ -376,6 +373,7 @@ _COMPILER_RT_LIBS_i386= \
 	libclang_rt.ubsan_standalone-i386.so \
 	libclang_rt.ubsan_standalone_cxx-i386.a
 .if ${ARCH} == "amd64"
+_COMPILER_RT_IGNORELISTS=	cfi_ignorelist.txt
 _COMPILER_RT_IGNORELISTS+=	asan_ignorelist.txt
 _COMPILER_RT_IGNORELISTS+=	msan_ignorelist.txt
 _COMPILER_RT_LIBS= \
@@ -423,10 +421,31 @@ _COMPILER_RT_LIBS= \
 .if exists(/usr/lib32/libc.so.7)
 _COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
 .endif
-.endif
-.if ${ARCH} == "i386"
+.elif ${ARCH} == "i386"
+_COMPILER_RT_IGNORELISTS=	cfi_ignorelist.txt
 _COMPILER_RT_IGNORELISTS+=	asan_ignorelist.txt
 _COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
+.elif ${ARCH} == "riscv64"
+_COMPILER_RT_IGNORELISTS=	asan_ignorelist.txt
+_COMPILER_RT_LIBS= \
+	libclang_rt.asan-preinit-riscv64.a \
+	libclang_rt.asan-riscv64.a \
+	libclang_rt.asan-riscv64.a.syms \
+	libclang_rt.asan-riscv64.so \
+	libclang_rt.asan_cxx-riscv64.a \
+	libclang_rt.asan_cxx-riscv64.a.syms \
+	libclang_rt.asan_static-riscv64.a \
+	libclang_rt.builtins-riscv64.a \
+	libclang_rt.stats-riscv64.a \
+	libclang_rt.stats_client-riscv64.a \
+	libclang_rt.ubsan_minimal-riscv64.a \
+	libclang_rt.ubsan_minimal-riscv64.a.syms \
+	libclang_rt.ubsan_minimal-riscv64.so \
+	libclang_rt.ubsan_standalone-riscv64.a \
+	libclang_rt.ubsan_standalone-riscv64.a.syms \
+	libclang_rt.ubsan_standalone-riscv64.so \
+	libclang_rt.ubsan_standalone_cxx-riscv64.a \
+	libclang_rt.ubsan_standalone_cxx-riscv64.a.syms
 .endif
 
 # Comment out plist entries for unsupported options.
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index d3e542a1c864..203f3cb5abc6 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,6 +4,6 @@
 #
 LLVM_MAJOR=	15
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20220328
+SNAPDATE=	20220414
 
-LLVM_PROJECT_COMMIT=		52fa1d1a02940ac46aac5b8d6f87ca9d6a6a97be
+LLVM_PROJECT_COMMIT=		2c2568f39ec641aa8f1dcc011f2ce642c2d3423f
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index ec80b077287c..a49125d59db4 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648489580
-SHA256 (llvm-llvm-project-15.0.d20220328-52fa1d1a02940ac46aac5b8d6f87ca9d6a6a97be_GH0.tar.gz) = 0e2d0db416b995499e6784f56503164e8d015147d7144ef8dc230a04c460bd15
-SIZE (llvm-llvm-project-15.0.d20220328-52fa1d1a02940ac46aac5b8d6f87ca9d6a6a97be_GH0.tar.gz) = 162321409
+TIMESTAMP = 1649969473
+SHA256 (llvm-llvm-project-15.0.d20220414-2c2568f39ec641aa8f1dcc011f2ce642c2d3423f_GH0.tar.gz) = 134d641863b6744c6b8e4fcf38409093090e558ca80594990a75c2ded40da661
+SIZE (llvm-llvm-project-15.0.d20220414-2c2568f39ec641aa8f1dcc011f2ce642c2d3423f_GH0.tar.gz) = 162847271
diff --git a/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt b/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt
new file mode 100644
index 000000000000..cf887032f61d
--- /dev/null
+++ b/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt
@@ -0,0 +1,14 @@
+Work around inability to configure with
+https://reviews.llvm.org/rG7fa7b0cbd8f8d43c2237b75423cd25e74edde820
+
+--- openmp/libomptarget/plugins/amdgpu/CMakeLists.txt.orig
++++ openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
+@@ -71,7 +71,7 @@
+       src/rtl.cpp
+       ${LIBOMPTARGET_EXTRA_SOURCE}
+       )
+-add_dependencies(omptarget.rtl.amdgpu omptarget.devicertl.amdgpu)
++#add_dependencies(omptarget.rtl.amdgpu omptarget.devicertl.amdgpu)
+ 
+ # Install plugin under the lib destination folder.
+ # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 4f656258018d..4b41a80eef20 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -514,6 +514,7 @@ llvm-devel/bin/verify-uselistorder
 %%EXTRAS%%llvm-devel/include/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/modernize/LoopConvertCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/modernize/LoopConvertUtils.h
+%%EXTRAS%%llvm-devel/include/clang-tidy/modernize/MacroToEnumCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/modernize/MakeSharedCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/modernize/MakeSmartPtrCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/modernize/MakeUniqueCheck.h
@@ -569,6 +570,7 @@ llvm-devel/bin/verify-uselistorder
 %%EXTRAS%%llvm-devel/include/clang-tidy/performance/UnnecessaryValueParamCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/portability/RestrictSystemIncludesCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/portability/SIMDIntrinsicsCheck.h
+%%EXTRAS%%llvm-devel/include/clang-tidy/portability/StdAllocatorConstCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/readability/AvoidConstParamsInDecls.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/readability/BracesAroundStatementsCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/readability/ConstReturnTypeCheck.h
@@ -747,6 +749,7 @@ llvm-devel/bin/verify-uselistorder
 %%CLANG%%llvm-devel/include/clang/AST/PrettyDeclStackTrace.h
 %%CLANG%%llvm-devel/include/clang/AST/PrettyPrinter.h
 %%CLANG%%llvm-devel/include/clang/AST/QualTypeNames.h
+%%CLANG%%llvm-devel/include/clang/AST/Randstruct.h
 %%CLANG%%llvm-devel/include/clang/AST/RawCommentList.h
 %%CLANG%%llvm-devel/include/clang/AST/RecordLayout.h
 %%CLANG%%llvm-devel/include/clang/AST/RecursiveASTVisitor.h
@@ -2391,6 +2394,7 @@ llvm-devel/include/llvm/Bitcode/BitcodeReader.h
 llvm-devel/include/llvm/Bitcode/BitcodeWriter.h
 llvm-devel/include/llvm/Bitcode/BitcodeWriterPass.h
 llvm-devel/include/llvm/Bitcode/LLVMBitCodes.h
+llvm-devel/include/llvm/Bitstream/BitCodeEnums.h
 llvm-devel/include/llvm/Bitstream/BitCodes.h
 llvm-devel/include/llvm/Bitstream/BitstreamReader.h
 llvm-devel/include/llvm/Bitstream/BitstreamWriter.h
@@ -2402,6 +2406,7 @@ llvm-devel/include/llvm/CodeGen/AsmPrinterHandler.h
 llvm-devel/include/llvm/CodeGen/AtomicExpandUtils.h
 llvm-devel/include/llvm/CodeGen/BasicBlockSectionUtils.h
 llvm-devel/include/llvm/CodeGen/BasicTTIImpl.h
+llvm-devel/include/llvm/CodeGen/CFIFixup.h
 llvm-devel/include/llvm/CodeGen/CSEConfigBase.h
 llvm-devel/include/llvm/CodeGen/CalcSpillWeights.h
 llvm-devel/include/llvm/CodeGen/CallingConvLower.h
@@ -2854,6 +2859,7 @@ llvm-devel/include/llvm/Debuginfod/HTTPClient.h
 llvm-devel/include/llvm/Demangle/Demangle.h
 llvm-devel/include/llvm/Demangle/DemangleConfig.h
 llvm-devel/include/llvm/Demangle/ItaniumDemangle.h
+llvm-devel/include/llvm/Demangle/ItaniumNodes.def
 llvm-devel/include/llvm/Demangle/MicrosoftDemangle.h
 llvm-devel/include/llvm/Demangle/MicrosoftDemangleNodes.h
 llvm-devel/include/llvm/Demangle/StringView.h
@@ -3261,6 +3267,7 @@ llvm-devel/include/llvm/Object/MachOUniversalWriter.h
 llvm-devel/include/llvm/Object/Minidump.h
 llvm-devel/include/llvm/Object/ModuleSymbolTable.h
 llvm-devel/include/llvm/Object/ObjectFile.h
+llvm-devel/include/llvm/Object/OffloadBinary.h
 llvm-devel/include/llvm/Object/RelocationResolver.h
 llvm-devel/include/llvm/Object/StackMapParser.h
 llvm-devel/include/llvm/Object/SymbolSize.h
@@ -3689,7 +3696,7 @@ llvm-devel/include/llvm/Transforms/Scalar/LoopStrengthReduce.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopUnrollAndJamPass.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopUnrollPass.h
 llvm-devel/include/llvm/Transforms/Scalar/LoopVersioningLICM.h
-llvm-devel/include/llvm/Transforms/Scalar/LowerAtomic.h
+llvm-devel/include/llvm/Transforms/Scalar/LowerAtomicPass.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerConstantIntrinsics.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
 llvm-devel/include/llvm/Transforms/Scalar/LowerGuardIntrinsic.h
@@ -3759,6 +3766,7 @@ llvm-devel/include/llvm/Transforms/Utils/LoopRotationUtils.h
 llvm-devel/include/llvm/Transforms/Utils/LoopSimplify.h
 llvm-devel/include/llvm/Transforms/Utils/LoopUtils.h
 llvm-devel/include/llvm/Transforms/Utils/LoopVersioning.h
+llvm-devel/include/llvm/Transforms/Utils/LowerAtomic.h
 llvm-devel/include/llvm/Transforms/Utils/LowerGlobalDtors.h
 llvm-devel/include/llvm/Transforms/Utils/LowerInvoke.h
 llvm-devel/include/llvm/Transforms/Utils/LowerMemIntrinsics.h
@@ -3945,9 +3953,10 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/TensorToSPIRV/TensorToSPIRV.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/TensorToSPIRV/TensorToSPIRVPass.h
+%%MLIR%%llvm-devel/include/mlir/Conversion/TosaToArith/TosaToArith.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/TosaToLinalg/TosaToLinalg.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/TosaToSCF/TosaToSCF.h
-%%MLIR%%llvm-devel/include/mlir/Conversion/TosaToStandard/TosaToStandard.h
+%%MLIR%%llvm-devel/include/mlir/Conversion/TosaToTensor/TosaToTensor.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/VectorToGPU/VectorToGPU.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/VectorToLLVM/ConvertVectorToLLVM.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/VectorToROCDL/VectorToROCDL.h
@@ -4150,6 +4159,10 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMConversionEnumsToLLVM.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMConversions.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMDialect.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMIntrinsicConversions.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMIntrinsicOps.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMOpBase.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMOps.cpp.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/LLVMIR/LLVMOps.h.inc
@@ -4230,6 +4243,15 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/Transforms/Hoisting.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/Transforms/Transforms.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/Utils/Utils.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgram.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramBase.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramOps.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramOps.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramOps.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramOpsDialect.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramOpsDialect.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramOpsTypes.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/MLProgram/IR/MLProgramOpsTypes.h.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/Math/IR/Math.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Math/IR/MathBase.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/Math/IR/MathOps.cpp.inc
@@ -4255,6 +4277,14 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/MemRef/Transforms/Passes.h.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/MemRef/Transforms/Passes.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/MemRef/Utils/MemRefUtils.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPU.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPU.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPU.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPUDialect.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPUDialect.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPUDialect.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPUTypes.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/NVGPU/NVGPUTypes.h.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/OpenACC/AccCommon.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/OpenACC/OpenACC.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/OpenACC/OpenACCOps.cpp.inc
@@ -4461,6 +4491,14 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Tosa/Utils/QuantUtils.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Tosa/Utils/ShapeUtils.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Traits.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformDialect.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformDialect.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformDialect.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformDialect.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformInterfaces.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformInterfaces.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformInterfaces.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformInterfaces.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/Utils/IndexingUtils.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Utils/ReshapeOpsUtils.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Utils/StaticValueUtils.h
@@ -4497,6 +4535,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/ExecutionEngine/ExecutionEngine.h
 %%MLIR%%llvm-devel/include/mlir/ExecutionEngine/JitRunner.h
 %%MLIR%%llvm-devel/include/mlir/ExecutionEngine/MemRefUtils.h
+%%MLIR%%llvm-devel/include/mlir/ExecutionEngine/Msan.h
 %%MLIR%%llvm-devel/include/mlir/ExecutionEngine/OptUtils.h
 %%MLIR%%llvm-devel/include/mlir/ExecutionEngine/RunnerUtils.h
 %%MLIR%%llvm-devel/include/mlir/ExecutionEngine/SparseTensorUtils.h
@@ -4539,6 +4578,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/IR/BuiltinTypes.td
 %%MLIR%%llvm-devel/include/mlir/IR/Diagnostics.h
 %%MLIR%%llvm-devel/include/mlir/IR/Dialect.h
+%%MLIR%%llvm-devel/include/mlir/IR/DialectBase.td
 %%MLIR%%llvm-devel/include/mlir/IR/DialectImplementation.h
 %%MLIR%%llvm-devel/include/mlir/IR/DialectInterface.h
 %%MLIR%%llvm-devel/include/mlir/IR/DialectRegistry.h
@@ -5292,6 +5332,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLoopLikeInterface.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLspServerLib.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLspServerSupportLib.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRMLProgram.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRMath.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRMathTestPasses.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRMathToLLVM.a
@@ -5306,6 +5347,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRMemRefUtils.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRMlirOptMain.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRModuleBufferization.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRNVGPU.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRNVVMIR.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRNVVMToLLVMIRTranslation.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIROpenACC.a
@@ -5382,15 +5424,18 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTestPass.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTestReducer.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTestRewrite.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTestTransformDialect.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTestTransforms.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTilingInterface.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRToLLVMIRTranslationRegistration.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosa.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosaTestPasses.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosaToArith.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosaToLinalg.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosaToSCF.a
-%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosaToStandard.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosaToTensor.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTosaTransforms.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTransformDialect.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTransformUtils.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTransforms.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRTranslateLib.a