ART-tests: remove DX dependency from 706-checker-scheduler.
With the D8 generated code 2 PHI instruction are swapped in the ARM64
code. This CL updates the corresponding CHECK conditions and enables
D8.
Test: art/test.py -b -r --target -t 706-checker-scheduler
Bug: 65168732
Change-Id: If17bfdd0732b850279a10736c15ef296e15f0c90
diff --git a/test/706-checker-scheduler/build b/test/706-checker-scheduler/build
deleted file mode 100644
index d85147f..0000000
--- a/test/706-checker-scheduler/build
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2018 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# See b/65168732
-export USE_D8=false
-
-./default-build "$@"
diff --git a/test/706-checker-scheduler/src/Main.java b/test/706-checker-scheduler/src/Main.java
index 25e4fad..eb985d0 100644
--- a/test/706-checker-scheduler/src/Main.java
+++ b/test/706-checker-scheduler/src/Main.java
@@ -35,8 +35,8 @@
/// CHECK-START-ARM64: int Main.arrayAccess() scheduler (before)
/// CHECK: <<Const1:i\d+>> IntConstant 1
- /// CHECK: <<i0:i\d+>> Phi
/// CHECK: <<res0:i\d+>> Phi
+ /// CHECK: <<i0:i\d+>> Phi
/// CHECK: <<Array:i\d+>> IntermediateAddress
/// CHECK: <<ArrayGet1:i\d+>> ArrayGet [<<Array>>,<<i0>>]
/// CHECK: <<res1:i\d+>> Add [<<res0>>,<<ArrayGet1>>]
@@ -46,8 +46,8 @@
/// CHECK-START-ARM64: int Main.arrayAccess() scheduler (after)
/// CHECK: <<Const1:i\d+>> IntConstant 1
- /// CHECK: <<i0:i\d+>> Phi
/// CHECK: <<res0:i\d+>> Phi
+ /// CHECK: <<i0:i\d+>> Phi
/// CHECK: <<Array:i\d+>> IntermediateAddress
/// CHECK: <<ArrayGet1:i\d+>> ArrayGet [<<Array>>,<<i0>>]
/// CHECK: <<i1:i\d+>> Add [<<i0>>,<<Const1>>]