# HG changeset patch
# User cfang
# Date 1257547133 28800
# Node ID 395db6268de25d5753e637386240f473511a46a5
# Parent  3a2dae936e3608a766a960774c5e20aa105cf6b6
6876276: assert(!is_visited,"visit only once")
Summary: schedule the superword loads based on dependence constraints
Reviewed-by: kvn, never

diff -r 3a2dae936e36 -r 395db6268de2 src/share/vm/opto/superword.cpp
--- a/src/share/vm/opto/superword.cpp	Fri Nov 06 10:23:54 2009 -0800
+++ b/src/share/vm/opto/superword.cpp	Fri Nov 06 14:38:53 2009 -0800
@@ -990,8 +990,8 @@
 // (5) We know there is no dependence cycle, so there in no other case;
 // (6) Finally, all memory ops in another single pack should be moved in the same direction.
 //
-// To schedule a load pack: the memory edge of every loads in the pack must be
-// the same as the memory edge of the last executed load in the pack
+// To schedule a load pack, we use the memory state of either the first or the last load in
+// the pack, based on the dependence constraint.
 void SuperWord::co_locate_pack(Node_List* pk) {
   if (pk->at(0)->is_Store()) {
     MemNode* first     = executed_first(pk)->as_Mem();
@@ -1076,15 +1076,32 @@
       current = my_mem->as_Mem();
     } // end while
   } else if (pk->at(0)->is_Load()) { //load
-    // all use the memory state that the last executed load uses
-    LoadNode* last_load  = executed_last(pk)->as_Load();
-    Node* last_mem       = last_load->in(MemNode::Memory);
-    _igvn.hash_delete(last_mem);
-    // Give each load same memory state as last
+    // all loads in the pack should have the same memory state. By default,
+    // we use the memory state of the last load. However, if any load could
+    // not be moved down due to the dependence constraint, we use the memory
+    // state of the first load.
+    Node* last_mem  = executed_last(pk)->in(MemNode::Memory);
+    Node* first_mem = executed_first(pk)->in(MemNode::Memory);
+    bool schedule_last = true;
+    for (uint i = 0; i < pk->size(); i++) {
+      Node* ld = pk->at(i);
+      for (Node* current = last_mem; current != ld->in(MemNode::Memory);
+           current=current->in(MemNode::Memory)) {
+        assert(current != first_mem, "corrupted memory graph");
+        if(current->is_Mem() && !independent(current, ld)){
+          schedule_last = false; // a later store depends on this load
+          break;
+        }
+      }
+    }
+
+    Node* mem_input = schedule_last ? last_mem : first_mem;
+    _igvn.hash_delete(mem_input);
+    // Give each load the same memory state
     for (uint i = 0; i < pk->size(); i++) {
       LoadNode* ld = pk->at(i)->as_Load();
       _igvn.hash_delete(ld);
-      ld->set_req(MemNode::Memory, last_mem);
+      ld->set_req(MemNode::Memory, mem_input);
       _igvn._worklist.push(ld);
     }
   }
diff -r 3a2dae936e36 -r 395db6268de2 test/compiler/6636138/Test1.java
--- a/test/compiler/6636138/Test1.java	Fri Nov 06 10:23:54 2009 -0800
+++ b/test/compiler/6636138/Test1.java	Fri Nov 06 14:38:53 2009 -0800
@@ -45,7 +45,7 @@
         for (int i = 0; i < src.length; i++) {
             if (src[i] != ref[i]) {
                 System.out.println("Error: src and ref don't match at " + i);
-                System.exit(-1);
+                System.exit(97);
             }
         }
     }
diff -r 3a2dae936e36 -r 395db6268de2 test/compiler/6636138/Test2.java
--- a/test/compiler/6636138/Test2.java	Fri Nov 06 10:23:54 2009 -0800
+++ b/test/compiler/6636138/Test2.java	Fri Nov 06 14:38:53 2009 -0800
@@ -51,7 +51,7 @@
             int value = (i-1 + src.length)%src.length; // correct value after shifting
                 if (src[i] != value) {
                     System.out.println("Error: src["+i+"] should be "+ value + " instead of " + src[i]);
-                    System.exit(-1);
+                    System.exit(97);
                 }
         }
     }