[PATCH] Fix instruction scheduling live register tracking

[Paweł Bylica]

Priority in live reg gen for phys reg copies.

I tried Andrew's proposition to separate node's DAG height from schedule cycle without success. I think the problem is different.

In my case there is a PHYS REG COPY node that might have incorrect height. During unscheduling this phys reg copy node is not set as a live reg gen because it looses against some other successor that has lower height. If I prioritise phys reg copies in gen update the test passes. No other regressions.

I think I need more information about these phys reg copy nodes to investigate more. What do they mean and where do they come from? I cannot see this problematic node in the DAG log before scheduling. Maybe we should change the height assinged to that nodes.


http://reviews.llvm.org/D9993

Files:
  lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
  test/CodeGen/X86/rrlist-livereg-corrutpion.ll

Index: lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
===================================================================
--- lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
+++ lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
@@ -857,7 +857,8 @@
       // pending if this is a two-address node.
       LiveRegDefs[I->getReg()] = SU;
       if (LiveRegGens[I->getReg()] == nullptr ||
-          I->getSUnit()->getHeight() < LiveRegGens[I->getReg()]->getHeight())
+          I->getSUnit()->getHeight() < LiveRegGens[I->getReg()]->getHeight() ||
+          !I->getSUnit()->getNode()) // Prority for phys reg copies
         LiveRegGens[I->getReg()] = I->getSUnit();
     }
   }
Index: test/CodeGen/X86/rrlist-livereg-corrutpion.ll
===================================================================
--- /dev/null
+++ test/CodeGen/X86/rrlist-livereg-corrutpion.ll
@@ -0,0 +1,26 @@
+; RUN: llc < %s -march=x86-64 | FileCheck %s
+
+; CHECK-LABEL: test
+define i64 @test(i64 %a, i256 %b, i1 %c) {
+  %u = zext i64 %a to i256
+  %s = add i256 %u, 1
+  %o = trunc i256 %s to i1
+  %j = add i256 %s, 1
+  %i = icmp ule i64 %a, 1
+  %f = select i1 %o, i256 undef, i256 %j
+  %d = select i1 %i, i256 %f, i256 1
+  %e = add i256 %b, 1
+  %n = select i1 %c, i256 %e, i256 %b
+  %m = trunc i256 %n to i64
+  %h = add i64 %m, 1
+  %r = zext i64 %h to i256
+  %v = lshr i256 %d, %r
+  %t = trunc i256 %v to i1
+  %q = shl i256 1, %r
+  %p = and i256 %d, %q
+  %w = icmp ule i256 %n, 1
+  %y = select i1 %t, i256 undef, i256 %p
+  %x = select i1 %w, i256 %y, i256 %d
+  %z = trunc i256 %x to i64
+  ret i64 %z
+}

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D9993.26957.patch
Type: text/x-patch
Size: 1593 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150602/6cb125fe/attachment.bin>