Skip to content

Commit

Permalink
[TableGen][AsmWriterEmitter] Use a deterministic order to sort InstrA…
Browse files Browse the repository at this point in the history
…liases

Inside an alias group, when ordering instruction aliases, we rely
on the priority field to sort them.
When the priority is not set or more generally when there is a tie between
two aliases, we used to rely on the lexicographic order. However, this
order can change for the anonymous records when more instruction, intrinsic,
etc. are inserted.

For instance, given two anonymous records r1 and r2 with respective name
A_999 and A_1000, their lexicography order will be r2 then r1. Now, if
an instruction is added before them, their name will become respectively
A_1000 and A_1001, thus the lexicography order will be r1 then r2, i.e.,
it changed.

If that happens in an alias group, the assembly output would prefer a
different alias for no apparent good reasons.

A way to fix that is to use proper priority for all aliases, but we
can also make the tie breaker comparison smarter and use a deterministic
ordering. This is what this patch does.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294695 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
Quentin Colombet committed Feb 10, 2017
1 parent dd3604d commit dffd427
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion utils/TableGen/AsmWriterEmitter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ struct AliasPriorityComparator {
if (LHS.second == RHS.second) {
// We don't actually care about the order, but for consistency it
// shouldn't depend on pointer comparisons.
return LHS.first.TheDef->getName() < RHS.first.TheDef->getName();
return LessRecordByID()(LHS.first.TheDef, RHS.first.TheDef);
}

// Aliases with larger priorities should be considered first.
Expand Down

0 comments on commit dffd427

Please sign in to comment.