From 3060bb919cd2f37c6a97e87c1581ac5294af72b3 Mon Sep 17 00:00:00 2001 From: Ulyana Trafimovich Date: Thu, 16 Jul 2020 14:17:11 +0000 Subject: Revert "VIXL simulator for ART (Stage1)" This reverts commit 48ca6a681efe1fa1cf82d8af918bf9bbfd35ae96. Reason for revert: broken build 6685551 on aosp-master on full-eng Bug: 161440641 Change-Id: I849fe53f56c4786f0f2a1605cbfd215559f11072 --- compiler/optimizing/codegen_test_utils.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'compiler/optimizing/codegen_test_utils.h') diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h index f873e7514ed..9d15f1f2940 100644 --- a/compiler/optimizing/codegen_test_utils.h +++ b/compiler/optimizing/codegen_test_utils.h @@ -223,15 +223,12 @@ static void VerifyGeneratedCode(InstructionSet target_isa, Expected expected) { ASSERT_TRUE(CanExecute(target_isa)) << "Target isa is not executable."; - // Simulator cannot run without runtime, because it needs quick entrypoints. - if (Runtime::Current() != nullptr) { - // Verify on simulator. - CodeSimulatorContainer simulator(target_isa); - if (simulator.CanSimulate()) { - Expected result = SimulatorExecute(simulator.Get(), f); - if (has_result) { - ASSERT_EQ(expected, result); - } + // Verify on simulator. + CodeSimulatorContainer simulator(target_isa); + if (simulator.CanSimulate()) { + Expected result = SimulatorExecute(simulator.Get(), f); + if (has_result) { + ASSERT_EQ(expected, result); } } -- cgit v1.2.3