Reland changes that depends on llvm/llvm-project@1cec5fffd8fd (#3959)

This PR relands changes that depends on
llvm/llvm-project@1cec5fffd8fd.
In order to use the updated LLVM pin, SPIRV translator needs to be also
updated.
We need to apply temporary changes to SPIRV translator, as the version
of SPIRV translator used in IGC is different.

---------

Signed-off-by: Whitney Tsang <[email protected]>
Co-authored-by: Anatoly Myachev <[email protected]>

Author: whitneywhtsang

cmake/llvm-hash.txt

@@ -1 +1 @@
-adba14acea99cc6a17d837763a3248c9d4a2fadf
+1cec5fffd8fddd9d85b516f876093b0e3f0eec5f

test/TritonGPU/amd/amd-range-analysis.mlir

@@ -6,6 +6,10 @@
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Interfaces/LoopLikeInterface.h"
 
+namespace mlir::triton {
+class FuncOp;
+}
+
 namespace mlir::triton::AMD {
 
 /// This struct (analysis) adapt's upstream's IntegerRangeAnalysis (inferring
@@ -35,11 +39,15 @@ struct TritonIntegerRangeAnalysis : dataflow::IntegerRangeAnalysis {
 
   void setToEntryState(dataflow::IntegerValueRangeLattice *lattice) override;
 
+  void initializeFuncOp(triton::FuncOp funcOp);
+
   LogicalResult visitOperation(
       Operation *op,
       ArrayRef<const dataflow::IntegerValueRangeLattice *> operands,
       ArrayRef<dataflow::IntegerValueRangeLattice *> resultsLattices) override;
 
+  std::optional<int64_t> maybeGetTripCount(LoopLikeOpInterface loop);
+
   /// This method (which overloads
   /// AbstractSparseForwardDataFlowAnalysis::visitRegionSuccessors)
   /// implements "abstract interpretation" of loops with statically known bounds
@@ -89,6 +97,8 @@ struct TritonIntegerRangeAnalysis : dataflow::IntegerRangeAnalysis {
   ///   [0, 2147483647] ∩ [-2147483648, 128] = [0, 128]
   std::optional<ConstantIntRanges> maybeGetAssumedRange(Value anchor) const;
 
+  int64_t getTotalLoopTripCount(LoopLikeOpInterface loop);
+
   /// Trip counts of all loops with static loop bounds contained under the root
   /// operation being analyzed. Note, nested loops have trip counts computed as
   /// a product of enclosing loops; i.e. for
@@ -117,7 +127,7 @@ struct TritonIntegerRangeAnalysis : dataflow::IntegerRangeAnalysis {
   llvm::DenseMap<Value, SetVector<Operation *>> assumptions;
 };
 
-std::optional<SmallVector<ConstantIntRanges>>
+std::optional<SmallVector<std::optional<ConstantIntRanges>>>
 collectRanges(const DataFlowSolver &solver, ValueRange values);
 
 bool cmpIIsStaticallyTrue(const DataFlowSolver &solver, arith::CmpIOp cmpOp);
@@ -127,6 +137,9 @@ bool isEmptyInitializedRange(ConstantIntRanges rv);
 void populateFoldTrueCmpIOpPatterns(RewritePatternSet &patterns,
                                     DataFlowSolver *solver);
 
+void initializeFuncOps(Operation *op,
+                       TritonIntegerRangeAnalysis *rangeAnalysis);
+
 } // namespace mlir::triton::AMD
 
 #endif