Integrate llvm/llvm-project@bbd2b08b95fe (2023-12-07) (#15844)

This commit updates LLVM submoulde to

* llvm/llvm-project@bbd2b08b95fe

With a local cherry-pick of llvm/llvm-project@0d0c22985522.

Includes a local patch to stablehlo to include the token name one liner
from here: openxla/stablehlo#1871 (a full
integrate of stablehlo looks quite invasive and due to
openxla/stablehlo#1872 and punted after seeing
if it would be easy).

---------

Co-authored-by: Lei Zhang <antiagainst@gmail.com>
Co-authored-by: hanhanW <hanhan0912@gmail.com>

compiler/src/iree/compiler/Codegen/SPIRV/SPIRVInitialVectorLowering.cpp

@@ -449,6 +449,7 @@ class SPIRVInitialLoweringPass
           vector::VectorTransformsOptions().setVectorTransposeLowering(
               vector::VectorTransposeLowering::EltWise);
       vector::populateVectorTransposeLoweringPatterns(patterns, options);
+      vector::populateVectorShapeCastLoweringPatterns(patterns);
       if (failed(applyPatternsAndFoldGreedily(funcOp, std::move(patterns)))) {
         return signalPassFailure();
       }

compiler/src/iree/compiler/Codegen/SPIRV/test/lowering_matvec.mlir

@@ -79,8 +79,8 @@ hal.executable @i4_dequant_matvec_f32 {
 //         CHECK:     %[[BCAST:.+]] = vector.broadcast %[[ADD]] : vector<4xf32> to vector<1x4xf32>
 //         CHECK:     scf.yield %[[BCAST]] : vector<1x4xf32>
 
-//         CHECK:   %[[SCAST:.+]] = vector.shape_cast %[[FOR]] : vector<1x4xf32> to vector<4xf32>
-//         CHECK:   %[[REDUCE:.+]] = vector.reduction <add>, %[[SCAST]] : vector<4xf32> into f32
+//         CHECK:   %[[EXTRACT3:.+]] = vector.extract %[[FOR]][0] : vector<4xf32> from vector<1x4xf32>
+//         CHECK:   %[[REDUCE:.+]] = vector.reduction <add>, %[[EXTRACT3]] : vector<4xf32> into f32
 //         CHECK:   gpu.subgroup_reduce add %[[REDUCE]] : (f32) -> f32
 //         CHECK:   scf.if
 //         CHECK:     vector.transfer_write

compiler/src/iree/compiler/Dialect/Flow/IR/FlowTypes.h

@@ -53,6 +53,8 @@ class DispatchTensorType
 
   using Base::Base;
 
+  static constexpr StringLiteral name = "flow.dispatch_tensor";
+
   /// Get or create a new DispatchTensorType of the provided shape and
   /// element type. Assumes the arguments define a well-formed
   /// DispatchTensorType.

compiler/src/iree/compiler/Dialect/HAL/IR/HALTypes.h

@@ -73,6 +73,8 @@ std::optional<uint64_t> lookupOffsetOrAlignment(Value value);
 
 struct AllocatorType : public Type::TypeBase<AllocatorType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.allocator";
 };
 
 struct BufferType
@@ -81,6 +83,8 @@ struct BufferType
                             IREE::Util::ReferenceTypeInterface::Trait> {
   using Base::Base;
 
+  static constexpr StringLiteral name = "hal.buffer";
+
   Value inferSizeFromValue(Location loc, Value value, OpBuilder &builder) const;
 };
 
@@ -90,53 +94,75 @@ struct BufferViewType
                             IREE::Util::ReferenceTypeInterface::Trait> {
   using Base::Base;
 
+  static constexpr StringLiteral name = "hal.buffer_view";
+
   Value inferSizeFromValue(Location loc, Value value, OpBuilder &builder) const;
 };
 
 struct ChannelType : public Type::TypeBase<ChannelType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.channel";
 };
 
 struct CommandBufferType
     : public Type::TypeBase<CommandBufferType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.command_buffer";
 };
 
 struct DescriptorSetLayoutType
     : public Type::TypeBase<DescriptorSetLayoutType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.descriptor_set_layout";
 };
 
 struct DeviceType
     : public Type::TypeBase<DeviceType, Type, TypeStorage,
                             mlir::OpTrait::IREE::Util::ImplicitlyCaptured> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.device";
 };
 
 struct EventType : public Type::TypeBase<EventType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.event";
 };
 
 struct ExecutableType
     : public Type::TypeBase<ExecutableType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.executable";
 };
 
 struct FenceType : public Type::TypeBase<FenceType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.fence";
 };
 
 struct FileType : public Type::TypeBase<FileType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.file";
 };
 
 struct PipelineLayoutType
     : public Type::TypeBase<PipelineLayoutType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.pipeline_layout";
 };
 
 struct SemaphoreType : public Type::TypeBase<SemaphoreType, Type, TypeStorage> {
   using Base::Base;
+
+  static constexpr StringLiteral name = "hal.semaphore";
 };
 
 //===----------------------------------------------------------------------===//

compiler/src/iree/compiler/Dialect/VM/IR/VMTypes.h

@@ -33,6 +33,8 @@ struct RefTypeStorage;
 class BufferType : public Type::TypeBase<BufferType, Type, TypeStorage> {
 public:
   using Base::Base;
+
+  static constexpr StringLiteral name = "vm.buffer";
 };
 
 /// A list containing an optional element type.
@@ -41,6 +43,8 @@ class ListType
 public:
   using Base::Base;
 
+  static constexpr StringLiteral name = "vm.list";
+
   /// Returns true if the given type can be wrapped in a list.
   static bool isCompatible(Type type);
 
@@ -70,6 +74,8 @@ class ListType
 class OpaqueType : public Type::TypeBase<OpaqueType, Type, TypeStorage> {
 public:
   using Base::Base;
+
+  static constexpr StringLiteral name = "vm.opaque";
 };
 
 /// A ref<T> containing a reference to a ref-object-compatible type.
@@ -78,6 +84,8 @@ class RefType : public Type::TypeBase<RefType, Type, detail::RefTypeStorage> {
 public:
   using Base::Base;
 
+  static constexpr StringLiteral name = "vm.ref";
+
   /// Returns true if the given type can be wrapped in a ref ptr.
   static bool isCompatible(Type type);
 

compiler/src/iree/compiler/Dialect/Vulkan/IR/VulkanAttributes.h

@@ -28,6 +28,8 @@ class TargetEnvAttr
 public:
   using Base::Base;
 
+  static constexpr StringLiteral name = "vk.target_env";
+
   /// Gets a TargetEnvAttr instance.
   // TODO(antiagainst): support other physical device core properties, physical
   // device core features and per-extension features.