commit 13c3ce1edf7fa9e8e97fb60625a62cb97a13f9a9
author Santiago Aboy Solanes <solanes@google.com> Mon Dec 05 12:05:43 2022 +0000
committer Santiago Aboy Solanes <solanes@google.com> Mon Dec 05 17:26:27 2022 +0000
tree 2c4188ec7dbd450d158598527371edbaa3cbd3fa
parent 6d2b6bacc6ad5c7e85a8608094469088cd6c8f56

Update CanTriggerGC flag for ArraySet

ArraySet instructions can trigger a GC only when perforing a type
check. When clearing the needs type check flag, we should also
clear the CanTriggerGC flag from the instruction's side effects.
Note that once we clear the needs type check flag, we never set
it again.

Add check in graph checker that the needs type check and the can
trigger GC flag are consistent.

Add can_trigger_gc property to graph visualizer that reflects
whether the ArraySet instruction can trigger a GC.

Test: art/test/testrunner/testrunner.py --host --64 --optimizing -b
Change-Id: I4c74f902aabf2339bd292e9b24737f55d2737440

test/527-checker-array-access-split/src/Main.java

diff --git a/test/527-checker-array-access-split/src/Main.java b/test/527-checker-array-access-split/src/Main.java
index f39b5e2..cc1dc6b 100644
--- a/test/527-checker-array-access-split/src/Main.java
+++ b/test/527-checker-array-access-split/src/Main.java
@@ -593,12 +593,16 @@
   /// CHECK:                        ArrayGet [<<IntAddr1>>,{{i\d+}}]
   /// CHECK: <<IntAddr2:i\d+>>      IntermediateAddress [<<Array>>,<<DataOffset>>]
   /// CHECK:                        ArrayGet [<<IntAddr2>>,{{i\d+}}]
-  /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}]
+  /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}] needs_type_check:false can_trigger_gc:false
   /// CHECK: <<IntAddr3:i\d+>>      IntermediateAddress [<<Array>>,<<DataOffset>>]
   /// CHECK:                        ArrayGet [<<IntAddr3>>,{{i\d+}}]
   /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}]
   /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}]
   //
+  /// CHECK-START-ARM64: int Main.checkObjectArrayGet(int, java.lang.Integer[], java.lang.Integer[]) instruction_simplifier_arm64 (after)
+  /// CHECK:                        IntermediateAddress
+  /// CHECK:                        IntermediateAddress
+  /// CHECK:                        IntermediateAddress
   /// CHECK-NOT:                    IntermediateAddress
 
   /// CHECK-START-ARM64: int Main.checkObjectArrayGet(int, java.lang.Integer[], java.lang.Integer[]) GVN$after_arch (after)
@@ -608,12 +612,13 @@
   /// CHECK: <<IntAddr1:i\d+>>      IntermediateAddress [<<Array>>,<<DataOffset>>]
   /// CHECK:                        ArrayGet [<<IntAddr1>>,{{i\d+}}]
   /// CHECK:                        ArrayGet [<<IntAddr1>>,{{i\d+}}]
-  /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}]
-  /// CHECK: <<IntAddr3:i\d+>>      IntermediateAddress [<<Array>>,<<DataOffset>>]
-  /// CHECK:                        ArrayGet [<<IntAddr3>>,{{i\d+}}]
+  /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}] needs_type_check:false can_trigger_gc:false
+  /// CHECK:                        ArrayGet [<<IntAddr1>>,{{i\d+}}]
   /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}]
   /// CHECK:                        ArraySet [<<Array>>,{{i\d+}},{{l\d+}}]
   //
+  /// CHECK-START-ARM64: int Main.checkObjectArrayGet(int, java.lang.Integer[], java.lang.Integer[]) GVN$after_arch (after)
+  /// CHECK:                        IntermediateAddress
   /// CHECK-NOT:                    IntermediateAddress
   public final static int checkObjectArrayGet(int index, Integer[] a, Integer[] b) {
     Integer five = Integer.valueOf(5);