This is an archive of the discontinued LLVM Phabricator instance.

Differential D147090

[mlir][sparse] Fixing -Wignored-reference-qualifiers in MergerTest.cpp
ClosedPublic

Authored by wrengr on Mar 28 2023, 2:48 PM.

Details

Reviewers
aartbik
bixia
Peiming
nicolasvasilache
Commits
rG0ceec3ebfcf3: [mlir][sparse] Fixing -Wignored-reference-qualifiers in MergerTest.cpp
Summary

These warnings were introduced by D146561.

Diff Detail

Event Timeline

wrengr created this revision.Mar 28 2023, 2:48 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 28 2023, 2:48 PM
Herald added subscribers: hanchung, jsetoain, Moerafaat and 20 others. · View Herald Transcript
wrengr requested review of this revision.Mar 28 2023, 2:48 PM
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptMar 28 2023, 2:48 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Peiming accepted this revision.Mar 28 2023, 3:54 PM
This revision is now accepted and ready to land.Mar 28 2023, 3:54 PM
aartbik accepted this revision.Mar 28 2023, 3:58 PM
wrengr updated this revision to Diff 509169.Mar 28 2023, 4:33 PM

rebase

This revision was landed with ongoing or failed builds.Mar 28 2023, 4:33 PM
Closed by commit rG0ceec3ebfcf3: [mlir][sparse] Fixing -Wignored-reference-qualifiers in MergerTest.cpp (authored by wrengr). · Explain Why
This revision was automatically updated to reflect the committed changes.
wrengr added a commit: rG0ceec3ebfcf3: [mlir][sparse] Fixing -Wignored-reference-qualifiers in MergerTest.cpp.
Harbormaster completed remote builds in B222373: Diff 509169.Mar 29 2023, 1:16 AM

Revision Contents

PathSize
mlir/
unittests/
Dialect/
SparseTensor/
46 lines

Diff 509170

mlir/unittests/Dialect/SparseTensor/MergerTest.cpp

Show First 20 Lines • Show All 423 Lines • ▼ Show 20 Lines
#define IMPL_MERGER_TEST_CONJ_CONJ_UNDEF(CONJ1, CONJ2) \ #define IMPL_MERGER_TEST_CONJ_CONJ_UNDEF(CONJ1, CONJ2) \
TEST_F(MergerTest4T1LU, vector_##CONJ1##_##CONJ2) { \ TEST_F(MergerTest4T1LU, vector_##CONJ1##_##CONJ2) { \
const auto em = CONJ1##Expr(tensor(0), tensor(1)); \ const auto em = CONJ1##Expr(tensor(0), tensor(1)); \
const auto e = CONJ2##Expr(em, tensor(2)); \ const auto e = CONJ2##Expr(em, tensor(2)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const auto t2 = tid(2); \ const auto t2 = tid(2); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
const PatternRef p2 = tensorPattern(t2); \ PatternRef p2 = tensorPattern(t2); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \
loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \ loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \
s = merger.optimizeSet(s); \ s = merger.optimizeSet(s); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \
loopsToBits({{l0, t1}}), true); \ loopsToBits({{l0, t1}}), true); \
Show All 18 Lines#define IMPL_MERGER_TEST_CONJ_CONJ_SPARSE_OUT(CONJ1, CONJ2) \
TEST_F(MergerTest3T1LSo, vector_##CONJ1##_##CONJ2) { \ TEST_F(MergerTest3T1LSo, vector_##CONJ1##_##CONJ2) { \
const auto em = CONJ1##Expr(tensor(0), tensor(1)); \ const auto em = CONJ1##Expr(tensor(0), tensor(1)); \
const auto e = CONJ2##Expr(em, tensor(2)); \ const auto e = CONJ2##Expr(em, tensor(2)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const auto t2 = tid(2); \ const auto t2 = tid(2); \
const auto t3 = tid(3); \ const auto t3 = tid(3); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
const PatternRef p2 = tensorPattern(t2); \ PatternRef p2 = tensorPattern(t2); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \
loopsToBits({{l0, t0}, {l0, t1}, {l0, t3}})); \ loopsToBits({{l0, t0}, {l0, t1}, {l0, t3}})); \
s = merger.optimizeSet(s); \ s = merger.optimizeSet(s); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \
loopsToBits({{l0, t3}}), true); \ loopsToBits({{l0, t3}}), true); \
Show All 19 Lines
/// lat( i_01 / tensor_1 ) /// lat( i_01 / tensor_1 )
/// } /// }
#define IMPL_MERGER_TEST_DISJ(OP) \ #define IMPL_MERGER_TEST_DISJ(OP) \
TEST_F(MergerTest3T1L, vector_##OP) { \ TEST_F(MergerTest3T1L, vector_##OP) { \
const auto e = OP##Expr(tensor(0), tensor(1)); \ const auto e = OP##Expr(tensor(0), tensor(1)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
\ \
expectNumLatPoints(s, 3); \ expectNumLatPoints(s, 3); \
expectLatPoint(s, 0, OP##Pattern(p0, p1), \ expectLatPoint(s, 0, OP##Pattern(p0, p1), \
loopsToBits({{l0, t0}, {l0, t1}})); \ loopsToBits({{l0, t0}, {l0, t1}})); \
expectLatPointWithinRange(s, 1, 2, p0, loopsToBits({{l0, t0}})); \ expectLatPointWithinRange(s, 1, 2, p0, loopsToBits({{l0, t0}})); \
expectLatPointWithinRange(s, 1, 2, p1, loopsToBits({{l0, t1}})); \ expectLatPointWithinRange(s, 1, 2, p1, loopsToBits({{l0, t1}})); \
\ \
Show All 16 Lines
/// lat( i_00 i_01 / (tensor_0 * tensor_1) ) /// lat( i_00 i_01 / (tensor_0 * tensor_1) )
/// } /// }
#define IMPL_MERGER_TEST_CONJ(OP) \ #define IMPL_MERGER_TEST_CONJ(OP) \
TEST_F(MergerTest3T1L, vector_##OP) { \ TEST_F(MergerTest3T1L, vector_##OP) { \
const auto e = OP##Expr(tensor(0), tensor(1)); \ const auto e = OP##Expr(tensor(0), tensor(1)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
\ \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, OP##Pattern(p0, p1), \ expectLatPoint(s, 0, OP##Pattern(p0, p1), \
loopsToBits({{l0, t0}, {l0, t1}})); \ loopsToBits({{l0, t0}, {l0, t1}})); \
\ \
s = merger.optimizeSet(s); \ s = merger.optimizeSet(s); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
Show All 16 Lines
#define IMPL_MERGER_TEST_CONJ_DISJ(CONJ, DISJ) \ #define IMPL_MERGER_TEST_CONJ_DISJ(CONJ, DISJ) \
TEST_F(MergerTest4T1L, vector_##CONJ##_##DISJ) { \ TEST_F(MergerTest4T1L, vector_##CONJ##_##DISJ) { \
const auto em = CONJ##Expr(tensor(0), tensor(1)); \ const auto em = CONJ##Expr(tensor(0), tensor(1)); \
const auto e = DISJ##Expr(em, tensor(2)); \ const auto e = DISJ##Expr(em, tensor(2)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const auto t2 = tid(2); \ const auto t2 = tid(2); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
const PatternRef p2 = tensorPattern(t2); \ PatternRef p2 = tensorPattern(t2); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
\ \
expectNumLatPoints(s, 3); \ expectNumLatPoints(s, 3); \
expectLatPoint(s, 0, DISJ##Pattern(CONJ##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, DISJ##Pattern(CONJ##Pattern(p0, p1), p2), \
loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \ loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \
expectLatPointWithinRange(s, 1, 2, CONJ##Pattern(p0, p1), \ expectLatPointWithinRange(s, 1, 2, CONJ##Pattern(p0, p1), \
loopsToBits({{l0, t0}, {l0, t1}})); \ loopsToBits({{l0, t0}, {l0, t1}})); \
expectLatPointWithinRange(s, 1, 2, p2, loopsToBits({{l0, t2}})); \ expectLatPointWithinRange(s, 1, 2, p2, loopsToBits({{l0, t2}})); \
Show All 26 Lines
#define IMPL_MERGER_TEST_DISJ_DISJ(DISJ1, DISJ2) \ #define IMPL_MERGER_TEST_DISJ_DISJ(DISJ1, DISJ2) \
TEST_F(MergerTest4T1L, Vector_##DISJ1##_##DISJ2) { \ TEST_F(MergerTest4T1L, Vector_##DISJ1##_##DISJ2) { \
const auto em = DISJ1##Expr(tensor(0), tensor(1)); \ const auto em = DISJ1##Expr(tensor(0), tensor(1)); \
const auto e = DISJ2##Expr(em, tensor(2)); \ const auto e = DISJ2##Expr(em, tensor(2)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const auto t2 = tid(2); \ const auto t2 = tid(2); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
const PatternRef p2 = tensorPattern(t2); \ PatternRef p2 = tensorPattern(t2); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
\ \
expectNumLatPoints(s, 7); \ expectNumLatPoints(s, 7); \
expectLatPoint(s, 0, DISJ2##Pattern(DISJ1##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, DISJ2##Pattern(DISJ1##Pattern(p0, p1), p2), \
loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \ loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \
expectLatPointWithinRange(s, 1, 6, DISJ2##Pattern(p1, p2), \ expectLatPointWithinRange(s, 1, 6, DISJ2##Pattern(p1, p2), \
loopsToBits({{l0, t1}, {l0, t2}})); \ loopsToBits({{l0, t1}, {l0, t2}})); \
expectLatPointWithinRange(s, 1, 6, DISJ2##Pattern(p0, p2), \ expectLatPointWithinRange(s, 1, 6, DISJ2##Pattern(p0, p2), \
Show All 32 Lines
#define IMPL_MERGER_TEST_CONJ_CONJ(CONJ1, CONJ2) \ #define IMPL_MERGER_TEST_CONJ_CONJ(CONJ1, CONJ2) \
TEST_F(MergerTest4T1L, vector_##CONJ1##_##CONJ2) { \ TEST_F(MergerTest4T1L, vector_##CONJ1##_##CONJ2) { \
const auto em = CONJ1##Expr(tensor(0), tensor(1)); \ const auto em = CONJ1##Expr(tensor(0), tensor(1)); \
const auto e = CONJ2##Expr(em, tensor(2)); \ const auto e = CONJ2##Expr(em, tensor(2)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const auto t2 = tid(2); \ const auto t2 = tid(2); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
const PatternRef p2 = tensorPattern(t2); \ PatternRef p2 = tensorPattern(t2); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \
loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \ loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}})); \
s = merger.optimizeSet(s); \ s = merger.optimizeSet(s); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \ expectLatPoint(s, 0, CONJ2##Pattern(CONJ1##Pattern(p0, p1), p2), \
loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}}), true); \ loopsToBits({{l0, t0}, {l0, t1}, {l0, t2}}), true); \
Show All 20 Lines
/// lat( i_00 / sparse_tensor_0 ) should be opted out as it only has dense diff /// lat( i_00 / sparse_tensor_0 ) should be opted out as it only has dense diff
/// with lat( i_00 i_01 / (sparse_tensor_0 + dense_tensor_1) ). /// with lat( i_00 i_01 / (sparse_tensor_0 + dense_tensor_1) ).
#define IMPL_MERGER_TEST_OPTIMIZED_DISJ(OP) \ #define IMPL_MERGER_TEST_OPTIMIZED_DISJ(OP) \
TEST_F(MergerTest3T1LD, vector_opted_##OP) { \ TEST_F(MergerTest3T1LD, vector_opted_##OP) { \
const auto e = OP##Expr(tensor(0), tensor(1)); \ const auto e = OP##Expr(tensor(0), tensor(1)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
\ \
expectNumLatPoints(s, 3); \ expectNumLatPoints(s, 3); \
expectLatPoint(s, 0, OP##Pattern(p0, p1), \ expectLatPoint(s, 0, OP##Pattern(p0, p1), \
loopsToBits({{l0, t0}, {l0, t1}})); \ loopsToBits({{l0, t0}, {l0, t1}})); \
expectLatPointWithinRange(s, 1, 2, p0, loopsToBits({{l0, t0}})); \ expectLatPointWithinRange(s, 1, 2, p0, loopsToBits({{l0, t0}})); \
expectLatPointWithinRange(s, 1, 2, p1, loopsToBits({{l0, t1}})); \ expectLatPointWithinRange(s, 1, 2, p1, loopsToBits({{l0, t1}})); \
\ \
Show All 20 Lines
/// } /// }
/// since i_01 is a dense dimension. /// since i_01 is a dense dimension.
#define IMPL_MERGER_TEST_OPTIMIZED_CONJ(OP) \ #define IMPL_MERGER_TEST_OPTIMIZED_CONJ(OP) \
TEST_F(MergerTest3T1LD, vector_opted_##OP) { \ TEST_F(MergerTest3T1LD, vector_opted_##OP) { \
const auto e = OP##Expr(tensor(0), tensor(1)); \ const auto e = OP##Expr(tensor(0), tensor(1)); \
const auto l0 = lid(0); \ const auto l0 = lid(0); \
const auto t0 = tid(0); \ const auto t0 = tid(0); \
const auto t1 = tid(1); \ const auto t1 = tid(1); \
const PatternRef p0 = tensorPattern(t0); \ PatternRef p0 = tensorPattern(t0); \
const PatternRef p1 = tensorPattern(t1); \ PatternRef p1 = tensorPattern(t1); \
auto s = merger.buildLattices(e, l0); \ auto s = merger.buildLattices(e, l0); \
\ \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
expectLatPoint(s, 0, OP##Pattern(p0, p1), \ expectLatPoint(s, 0, OP##Pattern(p0, p1), \
loopsToBits({{l0, t0}, {l0, t1}})); \ loopsToBits({{l0, t0}, {l0, t1}})); \
\ \
s = merger.optimizeSet(s); \ s = merger.optimizeSet(s); \
expectNumLatPoints(s, 1); \ expectNumLatPoints(s, 1); \
Show All 13 Lines