Skip to content

Commit 0b5cc5c

Browse files
committed
Fix alias analysis compiler errors
1 parent 7a5940c commit 0b5cc5c

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

include/triton/Analysis/Alias.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,10 @@ class SharedMemoryAliasAnalysis
8585
}
8686

8787
/// Computes if the alloc set of the results are changed.
88-
LogicalResult visitOperation(
89-
Operation *op, ArrayRef<const dataflow::Lattice<AliasInfo> *> operands,
90-
ArrayRef<dataflow::Lattice<AliasInfo> *> results) override;
88+
void
89+
visitOperation(Operation *op,
90+
ArrayRef<const dataflow::Lattice<AliasInfo> *> operands,
91+
ArrayRef<dataflow::Lattice<AliasInfo> *> results) override;
9192
};
9293

9394
} // namespace mlir

lib/Analysis/Alias.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ AliasInfo AliasInfo::join(const AliasInfo &lhs, const AliasInfo &rhs) {
2121
return ret;
2222
}
2323

24-
LogicalResult SharedMemoryAliasAnalysis::visitOperation(
24+
void SharedMemoryAliasAnalysis::visitOperation(
2525
Operation *op, ArrayRef<const dataflow::Lattice<AliasInfo> *> operands,
2626
ArrayRef<dataflow::Lattice<AliasInfo> *> results) {
2727
AliasInfo aliasInfo;
@@ -31,7 +31,7 @@ LogicalResult SharedMemoryAliasAnalysis::visitOperation(
3131
if (auto memdescTy = dyn_cast<triton::MemDescType>(result.getType())) {
3232
if (!isa_and_nonnull<triton::gpu::SharedMemorySpaceAttr>(
3333
memdescTy.getMemorySpace()))
34-
return mlir::success();
34+
return;
3535
}
3636

3737
// Only LocalAllocOp creates a new buffer.
@@ -50,12 +50,12 @@ LogicalResult SharedMemoryAliasAnalysis::visitOperation(
5050

5151
if (pessimistic) {
5252
setAllToEntryStates(results);
53-
return mlir::success();
53+
return;
5454
}
5555
// Join all lattice elements
5656
for (auto *result : results)
5757
propagateIfChanged(result, result->join(aliasInfo));
58-
return mlir::success();
58+
return;
5959
}
6060

6161
AliasResult SharedMemoryAliasAnalysis::alias(Value lhs, Value rhs) {

lib/Analysis/AxisInfo.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ class AxisInfoAnalysis : public dataflow::SparseForwardDataFlowAnalysis<
195195
dataflow::Lattice<AxisInfo>>::getLatticeElement;
196196
using FuncAxisInfoMapT = DenseMap<FunctionOpInterface, AxisInfo>;
197197

198-
LogicalResult visitOperation(
199-
Operation *op, ArrayRef<const dataflow::Lattice<AxisInfo> *> operands,
200-
ArrayRef<dataflow::Lattice<AxisInfo> *> results) override;
198+
void visitOperation(Operation *op,
199+
ArrayRef<const dataflow::Lattice<AxisInfo> *> operands,
200+
ArrayRef<dataflow::Lattice<AxisInfo> *> results) override;
201201
void
202202
visitForOpInductionVar(scf::ForOp op,
203203
ArrayRef<dataflow::Lattice<AxisInfo> *> argLattices);
@@ -1039,7 +1039,7 @@ AxisInfoAnalysis::AxisInfoAnalysis(DataFlowSolver &solver)
10391039
visitors.append<LoadOpAxisInfoVisitor>();
10401040
}
10411041

1042-
LogicalResult AxisInfoAnalysis::visitOperation(
1042+
void AxisInfoAnalysis::visitOperation(
10431043
Operation *op, ArrayRef<const dataflow::Lattice<AxisInfo> *> operands,
10441044
ArrayRef<dataflow::Lattice<AxisInfo> *> results) {
10451045
// TODO: For sure not the right way to do this
@@ -1050,7 +1050,7 @@ LogicalResult AxisInfoAnalysis::visitOperation(
10501050
AxisInfo curr = visitors.apply(op, operands);
10511051
if (curr.getRank() == 0) {
10521052
setAllToEntryStates(results);
1053-
return mlir::success();
1053+
return;
10541054
}
10551055
// override with hint
10561056
auto newContiguity = curr.getContiguity();
@@ -1073,7 +1073,7 @@ LogicalResult AxisInfoAnalysis::visitOperation(
10731073
// join all lattice elements
10741074
for (auto *result : results)
10751075
propagateIfChanged(result, result->join(curr));
1076-
return mlir::success();
1076+
return;
10771077
}
10781078

10791079
void AxisInfoAnalysis::visitForOpInductionVar(

0 commit comments

Comments
 (0)