Skip to content

Commit 8d5057d

Browse files
committed
use const& for AxisInfo constructors
Signed-off-by: Anatoly Myachev <[email protected]>
1 parent 24f95ab commit 8d5057d

File tree

2 files changed

+19
-31
lines changed

2 files changed

+19
-31
lines changed

third_party/intel/include/Analysis/AxisInfo.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ class AxisInfo {
2727
public:
2828
AxisInfo() : AxisInfo({}, {}, {}) {}
2929

30-
AxisInfo(DimVectorT contiguity, DimVectorT divisibility, DimVectorT constancy)
31-
: AxisInfo(std::move(contiguity), std::move(divisibility),
32-
std::move(constancy), std::nullopt) {}
30+
AxisInfo(const DimVectorT &contiguity, const DimVectorT &divisibility,
31+
const DimVectorT &constancy)
32+
: AxisInfo(contiguity, divisibility, constancy, std::nullopt) {}
3333

34-
AxisInfo(DimVectorT contiguity, DimVectorT divisibility, DimVectorT constancy,
35-
std::optional<int64_t> constantValue)
34+
AxisInfo(const DimVectorT &contiguity, const DimVectorT &divisibility,
35+
const DimVectorT &constancy, std::optional<int64_t> constantValue)
3636
: contiguity(contiguity), divisibility(divisibility),
3737
constancy(constancy), constantValue(constantValue) {
3838
assert(divisibility.size() == contiguity.size());

third_party/intel/lib/Analysis/AxisInfo.cpp

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@ class BinaryOpVisitorImpl : public AxisInfoVisitorImpl<OpTy> {
126126
divisibility.push_back(getDivisibility(op, lhsInfo, rhsInfo, d));
127127
}
128128
}
129-
return AxisInfo(std::move(contiguity), std::move(divisibility),
130-
std::move(constancy), constantValue);
129+
return AxisInfo(contiguity, divisibility, constancy, constantValue);
131130
}
132131

133132
protected:
@@ -547,8 +546,7 @@ class SplatOpAxisInfoVisitor final
547546
divisibility.push_back(opInfo.getDivisibility(0));
548547
constancy.push_back(retTy.getShape()[d]);
549548
}
550-
return AxisInfo(std::move(contiguity), std::move(divisibility),
551-
std::move(constancy),
549+
return AxisInfo(contiguity, divisibility, constancy,
552550
operands[0]->getValue().getConstantValue());
553551
}
554552
};
@@ -579,8 +577,7 @@ class LoadOpAxisInfoVisitor final : public AxisInfoVisitorImpl<triton::LoadOp> {
579577
maskInfo.has_value() ? maskInfo->getConstancy(d) : 0));
580578
}
581579

582-
return AxisInfo(std::move(contiguity), std::move(divisibility),
583-
std::move(constancy));
580+
return AxisInfo(contiguity, divisibility, constancy);
584581
}
585582
};
586583

@@ -614,8 +611,7 @@ class ExpandDimsOpAxisInfoVisitor final
614611
contiguity.insert(contiguity.begin() + op.getAxis(), 1);
615612
divisibility.insert(divisibility.begin() + op.getAxis(), newDivisibility);
616613
constancy.insert(constancy.begin() + op.getAxis(), 1);
617-
return AxisInfo(std::move(contiguity), std::move(divisibility),
618-
std::move(constancy),
614+
return AxisInfo(contiguity, divisibility, constancy,
619615
operands[0]->getValue().getConstantValue());
620616
}
621617
};
@@ -644,8 +640,7 @@ class BroadcastOpAxisInfoVisitor final
644640
constancy.push_back(opShape[d] == 1 ? retShape[d]
645641
: opInfo.getConstancy(d));
646642
}
647-
return AxisInfo(std::move(contiguity), std::move(divisibility),
648-
std::move(constancy),
643+
return AxisInfo(contiguity, divisibility, constancy,
649644
operands[0]->getValue().getConstantValue());
650645
}
651646
};
@@ -720,8 +715,7 @@ class CmpOpAxisInfoVisitor final : public AxisInfoVisitorImpl<OpTy> {
720715
contiguity.push_back(1);
721716
}
722717

723-
return AxisInfo(std::move(contiguity), std::move(divisibility),
724-
std::move(constancy), constantValue);
718+
return AxisInfo(contiguity, divisibility, constancy, constantValue);
725719
}
726720

727721
private:
@@ -849,8 +843,7 @@ class SelectOpAxisInfoVisitor final : public AxisInfoVisitorImpl<OpTy> {
849843
constantValue = lhsInfo.getConstantValue();
850844
}
851845

852-
return AxisInfo(std::move(contiguity), std::move(divisibility),
853-
std::move(constancy), constantValue);
846+
return AxisInfo(contiguity, divisibility, constancy, constantValue);
854847
}
855848
};
856849

@@ -1003,8 +996,7 @@ class MaxMinOpAxisInfoVisitor final : public AxisInfoVisitorImpl<OpTy> {
1003996
contiguity.push_back(
1004997
std::min(lhsInfo.getContiguity(d), rhsInfo.getContiguity(d)));
1005998
}
1006-
return AxisInfo(std::move(contiguity), std::move(divisibility),
1007-
std::move(constancy), std::nullopt);
999+
return AxisInfo(contiguity, divisibility, constancy, std::nullopt);
10081000
}
10091001
}
10101002
};
@@ -1054,8 +1046,7 @@ class MakeTensorPtrOpAxisInfoVisitor final
10541046

10551047
AxisInfo::DimVectorT constancy{1, 1};
10561048

1057-
return AxisInfo(std::move(contiguity), std::move(divisibility),
1058-
std::move(constancy));
1049+
return AxisInfo(contiguity, divisibility, constancy);
10591050
}
10601051
};
10611052

@@ -1139,8 +1130,8 @@ LogicalResult AxisInfoAnalysis::visitOperation(
11391130
auto vals = cast<DenseElementsAttr>(attr).getValues<int>();
11401131
newConstancy = AxisInfo::DimVectorT(vals.begin(), vals.end());
11411132
}
1142-
curr = AxisInfo(std::move(newContiguity), std::move(newDivisibility),
1143-
std::move(newConstancy), curr.getConstantValue());
1133+
curr = AxisInfo(newContiguity, newDivisibility, newConstancy,
1134+
curr.getConstantValue());
11441135
// join all lattice elements
11451136
for (auto *result : results)
11461137
propagateIfChanged(result, result->join(curr));
@@ -1157,8 +1148,7 @@ void AxisInfoAnalysis::visitForOpInductionVar(
11571148
AxisInfo::DimVectorT knownConstancy(1, 1);
11581149
knownDivisibility[0] = gcd(lb.getDivisibility(0), step.getDivisibility(0));
11591150
auto inductionVar =
1160-
AxisInfo(std::move(knownContiguity), std::move(knownDivisibility),
1161-
std::move(knownConstancy));
1151+
AxisInfo(knownContiguity, knownDivisibility, knownConstancy);
11621152
(void)argLattices[0]->join(inductionVar);
11631153
}
11641154

@@ -1245,8 +1235,7 @@ void AxisInfo::initPessimisticStateFromFunc(int argNumber, T funcOp,
12451235
}
12461236
}
12471237

1248-
return AxisInfo(std::move(knownContiguity), std::move(knownDivisibility),
1249-
std::move(knownConstancy));
1238+
return AxisInfo(knownContiguity, knownDivisibility, knownConstancy);
12501239
}
12511240

12521241
/*static*/ AxisInfo AxisInfo::join(const AxisInfo &lhs, const AxisInfo &rhs) {
@@ -1268,8 +1257,7 @@ void AxisInfo::initPessimisticStateFromFunc(int argNumber, T funcOp,
12681257
rhs.getConstantValue().has_value() &&
12691258
lhs.getConstantValue() == rhs.getConstantValue())
12701259
constantValue = lhs.getConstantValue();
1271-
return AxisInfo(std::move(contiguity), std::move(divisibility),
1272-
std::move(constancy), constantValue);
1260+
return AxisInfo(contiguity, divisibility, constancy, constantValue);
12731261
}
12741262

12751263
unsigned ModuleAxisInfoAnalysis::getPtrContiguity(Value ptr) {

0 commit comments

Comments
 (0)