[water] harden WaveIndexMappingAttr

[ftynse]

Add multiple verifiers on the invariants we always had but did not enforce
(potentially dropped by accident during refactoring). Sort symbols on
construction to ensure symbolically equal maps with different positions compare
as equal.

Signed-off-by: Alex Zinenko [email protected]

[tgymnich]

this may be easier to read.

Suggested change

	llvm::sort(symbolVector, [](Attribute lhs, Attribute rhs) {
	auto lhsSymbol = dyn_cast<WaveSymbolAttr>(lhs);
	auto lhsIndexSymbol = dyn_cast<WaveIndexSymbolAttr>(lhs);
	auto lhsIterSymbol = dyn_cast<WaveIterSymbolAttr>(lhs);
	auto rhsSymbol = dyn_cast<WaveSymbolAttr>(rhs);
	auto rhsIndexSymbol = dyn_cast<WaveIndexSymbolAttr>(rhs);
	auto rhsIterSymbol = dyn_cast<WaveIterSymbolAttr>(rhs);
	// For different kinds of symbols, index symbols come before iter symbols,
	// which come before regular symbols.
	if (lhsIndexSymbol && !rhsIndexSymbol)
	return true;
	if (!lhsIndexSymbol && rhsIndexSymbol)
	return false;
	if (lhsIterSymbol && rhsSymbol)
	return true;
	if (lhsSymbol && !rhsSymbol)
	return false;
	if (lhsSymbol && rhsSymbol)
	return lhsSymbol.getName() < rhsSymbol.getName();
	if (lhsIndexSymbol && rhsIndexSymbol)
	return lhsIndexSymbol.getValue() < rhsIndexSymbol.getValue();
	if (lhsIterSymbol && rhsIterSymbol)
	return lhsIterSymbol.getName() < rhsIterSymbol.getName();
	assert(false && "unhandled symbol comparison");
	});
	auto cmp = [](Attribute x) {
	return TypeSwitch<Attribute, std::pair<int, StringRef>>(x)
	.Case([](WaveIndexSymbolAttr a) {
	return std::make_pair(1, a.getValue());
	})
	.Case(
	[](WaveIterSymbolAttr a) { return std::make_pair(2, a.getName()); })
	.Case([](WaveSymbolAttr a) { return std::make_pair(3, a.getName()); })
	.DefaultUnreachable("unhandled symbol comparison");
	};
	llvm::sort(symbolVector,
	[&](Attribute lhs, Attribute rhs) { return cmp(lhs) < cmp(rhs); });
	});

[ftynse]

Good suggestion, I did it a bit differently since getValue on index symbols is not a string.

[tyb0807]

LGTM

[ftynse]

There actually was a bug in indexing ;) PTAL