diff --git a/bazel/import_llvm.bzl b/bazel/import_llvm.bzl index 9fad5e96e..15a9816f3 100644 --- a/bazel/import_llvm.bzl +++ b/bazel/import_llvm.bzl @@ -7,7 +7,7 @@ load( def import_llvm(name): """Imports LLVM.""" - LLVM_COMMIT = "7084110518f904192c2935327b884b17de00bee0" + LLVM_COMMIT = "d33e33fde770214e134ed58f992a5a95a522f7ff" new_git_repository( name = name, diff --git a/lib/Dialect/Secret/Conversions/SecretToCGGI/SecretToCGGI.cpp b/lib/Dialect/Secret/Conversions/SecretToCGGI/SecretToCGGI.cpp index 55cbab0a2..935b00ec4 100644 --- a/lib/Dialect/Secret/Conversions/SecretToCGGI/SecretToCGGI.cpp +++ b/lib/Dialect/Secret/Conversions/SecretToCGGI/SecretToCGGI.cpp @@ -528,7 +528,7 @@ struct ConvertSecretCastOp : public OpConversionPattern { // In other cases, use a reinterpret cast to resolve the memref shapes. int64_t offset; SmallVector strides; - if (failed(getStridesAndOffset(outRhsType, strides, offset))) + if (failed(outRhsType.getStridesAndOffset(strides, offset))) return rewriter.notifyMatchFailure( op, "failed to get stride and offset exprs"); auto castOp = rewriter.create( diff --git a/lib/Transforms/MemrefToArith/UnrollAndForward.cpp b/lib/Transforms/MemrefToArith/UnrollAndForward.cpp index 1d2e27ae1..7cb60d746 100644 --- a/lib/Transforms/MemrefToArith/UnrollAndForward.cpp +++ b/lib/Transforms/MemrefToArith/UnrollAndForward.cpp @@ -153,7 +153,7 @@ static FailureOr materializeAndFlatten(MemRefAccess access, for (auto ndx : materialized) { castIndices.push_back((int64_t)ndx); } - auto [strides, offset] = getStridesAndOffset(type); + auto [strides, offset] = type.getStridesAndOffset(); return flattenIndex(castIndices, strides, offset); } @@ -285,7 +285,8 @@ static LogicalResult forwardFullyUnrolledStoreToLoad( // In this case, the load cannot be completely removed, but instead can be // replaced with a load from the original memref at the appropriate index. const auto [endingStrides, endingOffset] = - getStridesAndOffset(llvm::cast(loadSourceMemref.getType())); + llvm::cast(loadSourceMemref.getType()) + .getStridesAndOffset(); ImplicitLocOpBuilder b(loadOp->getLoc(), loadOp); llvm::SmallVector indexValues; diff --git a/lib/Utils/TargetUtils.cpp b/lib/Utils/TargetUtils.cpp index dc7453613..266c79081 100644 --- a/lib/Utils/TargetUtils.cpp +++ b/lib/Utils/TargetUtils.cpp @@ -73,7 +73,7 @@ std::string flattenIndexExpression( std::string flattenIndexExpressionSOP( MemRefType memRefType, ValueRange indices, std::function valueToString) { - const auto [strides, offset] = getStridesAndOffset(memRefType); + const auto [strides, offset] = memRefType.getStridesAndOffset(); std::string accum = std::to_string(offset); for (size_t i = 0; i < indices.size(); ++i) { accum = llvm::formatv("{2} + {0} * {1}", valueToString(indices[i]), diff --git a/patches/llvm.patch b/patches/llvm.patch index fb968787a..ee454881c 100644 --- a/patches/llvm.patch +++ b/patches/llvm.patch @@ -1,49 +1,76 @@ Auto generated patch. Do not edit or delete it, even if empty. -diff -ruN --strip-trailing-cr a/mlir/include/mlir/IR/CommonTypeConstraints.td b/mlir/include/mlir/IR/CommonTypeConstraints.td ---- a/mlir/include/mlir/IR/CommonTypeConstraints.td -+++ b/mlir/include/mlir/IR/CommonTypeConstraints.td -@@ -329,31 +329,31 @@ - def F80 : F<80>; - def F128 : F<128>; - --def BF16 : Type($_self)">, "bfloat16 type">, -+def BF16 : Type($_self)">, "bfloat16 type">, - BuildableType<"$_builder.getType()">; --def TF32 : Type($_self)">, "tf32 type">, -+def TF32 : Type($_self)">, "tf32 type">, - BuildableType<"$_builder.getType()">; --def F8E4M3FN : Type($_self)">, "f8E4M3FN type">, -+def F8E4M3FN : Type($_self)">, "f8E4M3FN type">, - BuildableType<"$_builder.getType()">; --def F8E5M2 : Type($_self)">, "f8E5M2 type">, -+def F8E5M2 : Type($_self)">, "f8E5M2 type">, - BuildableType<"$_builder.getType()">; --def F8E4M3 : Type($_self)">, "f8E4M3 type">, -+def F8E4M3 : Type($_self)">, "f8E4M3 type">, - BuildableType<"$_builder.getType()">; --def F8E4M3FNUZ : Type($_self)">, "f8E4M3FNUZ type">, -+def F8E4M3FNUZ : Type($_self)">, "f8E4M3FNUZ type">, - BuildableType<"$_builder.getType()">; --def F8E4M3B11FNUZ : Type($_self)">, "f8E4M3B11FNUZ type">, -+def F8E4M3B11FNUZ : Type($_self)">, "f8E4M3B11FNUZ type">, - BuildableType<"$_builder.getType()">; --def F8E5M2FNUZ : Type($_self)">, "f8E5M2FNUZ type">, -+def F8E5M2FNUZ : Type($_self)">, "f8E5M2FNUZ type">, - BuildableType<"$_builder.getType()">; --def F8E3M4 : Type($_self)">, "f8E3M4 type">, -+def F8E3M4 : Type($_self)">, "f8E3M4 type">, - BuildableType<"$_builder.getType()">; --def F4E2M1FN : Type($_self)">, "f4E2M1FN type">, -+def F4E2M1FN : Type($_self)">, "f4E2M1FN type">, - BuildableType<"$_builder.getType()">; --def F6E2M3FN : Type($_self)">, "f6E2M3FN type">, -+def F6E2M3FN : Type($_self)">, "f6E2M3FN type">, - BuildableType<"$_builder.getType()">; --def F6E3M2FN : Type, "f6E3M2FN type">, -+def F6E3M2FN : Type($_self)">, "f6E3M2FN type">, - BuildableType<"$_builder.getType()">; --def F8E8M0FNU : Type($_self)">, "f8E8M0FNU type">, -+def F8E8M0FNU : Type($_self)">, "f8E8M0FNU type">, - BuildableType<"$_builder.getType()">; - - def AnyComplex : Type($_self)">, +diff -ruN --strip-trailing-cr a/lldb/bindings/interface/SBSaveCoreOptionsDocstrings.i b/lldb/bindings/interface/SBSaveCoreOptionsDocstrings.i +--- a/lldb/bindings/interface/SBSaveCoreOptionsDocstrings.i ++++ b/lldb/bindings/interface/SBSaveCoreOptionsDocstrings.i +@@ -1,71 +0,0 @@ +-%feature("docstring", +-"A container to specify how to save a core file. +- +-SBSaveCoreOptions includes API's to specify the memory regions and threads to include +-when generating a core file. It extends the existing SaveCoreStyle option. +- +-* eSaveCoreFull will save off all thread and memory regions, ignoring the memory regions and threads in +-the options object. +- +-* eSaveCoreDirtyOnly pages will capture all threads and all rw- memory regions, in addition to the regions specified +-in the options object if they are not already captured. +- +-* eSaveCoreStackOnly will capture all threads, but no memory regions unless specified. +- +-* eSaveCoreCustomOnly Custom defers entirely to the SBSaveCoreOptions object and will only save what is specified. +- Picking custom and specifying nothing will result in an error being returned. +- +-Note that currently ELF Core files are not supported. +-") +- +-%feature("docstring", " +- Set the plugin name to save a Core file with. Only plugins registered with Plugin manager will be accepted +- Examples are Minidump and Mach-O." +-) lldb::SBSaveCoreOptions::SetPluginName +- +-%feature("docstring", " +- Get the specified plugin name, or None if the name is not set." +-) lldb::SBSaveCoreOptions::GetPluginName +- +-%feature("docstring", " +- Set the lldb.SaveCoreStyle." +-) lldb::SBSaveCoreOptions::SetStyle +- +-%feature("docstring", " +- Get the specified lldb.SaveCoreStyle, or eSaveCoreUnspecified if not set." +-) lldb::SBSaveCoreOptions::GetStyle +- +-%feature("docstring", " +- Set the file path to save the Core file at." +-) lldb::SBSaveCoreOptions::SetOutputFile +- +-%feature("docstring", " +- Get an SBFileSpec corresponding to the specified output path, or none if not set." +-) lldb::SBSaveCoreOptions::GetOutputFile +- +-%feature("docstring", " +- Set the process to save, or unset a process by providing a default SBProcess. +- Resetting will result in the reset of all process specific options, such as Threads to save." +-) lldb::SBSaveCoreOptions::SetProcess +- +-%feature("docstring", " +- Add an SBThread to be saved, an error will be returned if an SBThread from a different process is specified. +- The process is set either by the first SBThread added to the options container, or explicitly by the SetProcess call." +-) lldb::SBSaveCoreOptions::AddThread +- +-%feature("docstring", " +- Remove an SBthread if present in the container, returns true if a matching thread was found and removed." +-) lldb::SBSaveCoreOptions::RemoveThread +- +-%feature("docstring", " +- Add a memory region to save, an error will be returned in the region is invalid. +- Ranges that overlap will be unioned into a single region." +-) lldb::SBSaveCoreOptions::AddMemoryRegionToSave +- +-%feature("docstring", " +- Get an SBThreadCollection of all threads marked to be saved. This collection is not sorted according to insertion order." +-) lldb::SBSaveCoreOptions::GetThreadsToSave +- +-%feature("docstring", " +- Unset all options." +-) lldb::SBSaveCoreOptions::Clear