Merge remote-tracking branch 'upstream/main'

Author: chencha3

build_tools/patches/0001-Add-support-for-VectorAnyINTEL-capability.patch

@@ -83,32 +83,32 @@ index af4f13dc0936..28d49d9e91f0 100644
 +// `allowedRanges` list, the list has two values, start and end of the range (inclusive)
 +class IsVectorOfLengthRangePred<list<int> allowedRanges> :
 +  And<[IsVectorTypePred,
-+       And<[CPred<[{$_self.cast<::mlir::VectorType>().getNumElements()
++       And<[CPred<[{cast<::mlir::VectorType>($_self).getNumElements()
 +                           >= }]
 +                         # allowedRanges[0]>,
-+                        CPred<[{$_self.cast<::mlir::VectorType>().getNumElements()
++                        CPred<[{cast<::mlir::VectorType>($_self).getNumElements()
 +                           <= }]
 +                         # allowedRanges[1]>]>]>;
 +
 +// Whether the number of elements of a fixed-length vector is from the given
 +// `allowedRanges` list, the list has two values, start and end of the range (inclusive)
 +class IsFixedVectorOfLengthRangePred<list<int> allowedRanges> :
 +  And<[IsFixedVectorTypePred,
-+       And<[CPred<[{$_self.cast<::mlir::VectorType>().getNumElements()
++       And<[CPred<[{cast<::mlir::VectorType>($_self).getNumElements()
 +                           >= }]
 +                         # allowedRanges[0]>,
-+                        CPred<[{$_self.cast<::mlir::VectorType>().getNumElements()
++                        CPred<[{cast<::mlir::VectorType>($_self).getNumElements()
 +                           <= }]
 +                         # allowedRanges[1]>]>]>;
 +
 +// Whether the number of elements of a scalable vector is from the given
 +// `allowedRanges` list, the list has two values, start and end of the range (inclusive)
 +class IsScalableVectorOfLengthRangePred<list<int> allowedRanges> :
 +  And<[IsVectorTypeWithAnyDimScalablePred,
-+       And<[CPred<[{$_self.cast<::mlir::VectorType>().getNumElements()
++       And<[CPred<[{cast<::mlir::VectorType>($_self).getNumElements()
 +                           >= }]
 +                         # allowedRanges[0]>,
-+                        CPred<[{$_self.cast<::mlir::VectorType>().getNumElements()
++                        CPred<[{cast<::mlir::VectorType>($_self).getNumElements()
 +                           <= }]
 +                         # allowedRanges[1]>]>]>;
 +
@@ -201,7 +201,7 @@ index 3f25696aa5eb..2d64fea0dc26 100644
 +  // Number of elements should be between [2 - 2^63 -1],
 +  // since getNumElements() returns an unsigned, the upper limit check is
 +  // unnecessary
-+  return type.getRank() == 1 && type.getElementType().isa<ScalarType>() &&
++  return type.getRank() == 1 && mlir::isa<ScalarType>(type.getElementType()) &&
 +         type.getNumElements() >= 2;
  }
 
@@ -329,15 +329,15 @@ index 4072608dc8f8..3fc675632970 100644
 +  //if (auto floatType = dyn_cast<FloatType>(type)) {
 +  // Convert to 32-bit float and remove floatType related capability
 +  // restriction
-+  if (auto floatType = type.dyn_cast<FloatType>()) {
++  if (auto floatType = dyn_cast<FloatType>(type)) {
      LLVM_DEBUG(llvm::dbgs() << type << " converted to 32-bit for SPIR-V\n");
      return Builder(targetEnv.getContext()).getF32Type();
    }
 
 -  auto intType = cast<IntegerType>(type);
 +  //auto intType = cast<IntegerType>(type);
 +  // Convert to 32-bit int and remove intType related capability restriction
-+  auto intType = type.cast<IntegerType>();
++  auto intType = cast<IntegerType>(type);
    LLVM_DEBUG(llvm::dbgs() << type << " converted to 32-bit for SPIR-V\n");
    return IntegerType::get(targetEnv.getContext(), /*width=*/32,
                            intType.getSignedness());
@@ -403,9 +403,9 @@ index 4072608dc8f8..3fc675632970 100644
 -    cast<spirv::SPIRVType>(valueType).getCapabilities(typeCapabilities);
 -    if (failed(checkCapabilityRequirements(op->getName(), this->targetEnv,
 -                                           typeCapabilities)))
-+    valueType.cast<spirv::SPIRVType>().getCapabilities(typeCapabilities);
++    cast<spirv::SPIRVType>(valueType).getCapabilities(typeCapabilities);
 +    typeExtensions.clear();
-+    valueType.cast<spirv::SPIRVType>().getExtensions(typeExtensions);
++    cast<spirv::SPIRVType>(valueType).getExtensions(typeExtensions);
 +    // Checking for capability and extension requirements along with capability
 +    // infered extensions
 +    // If a capability is present, the extension that