From 5439f051a950f0281eeafb8e8064839f2aea6e38 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Wed, 29 Jul 2020 10:03:46 +0100 Subject: Revert^3 "VIXL simulator for ART (Stage1)" This reverts commit e886d68b9c40c941d8966b9c90d0e265c75fb19e. Reason for revert: simulator implemention is not ready yet. Test: lunch aosp_cf_x86_phone-userdebug && m Test: art/test.py --run-test --optimizing --host Change-Id: I03c8c09ea348205b0238d7a26caef3477cd6ae3b --- 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 f873e7514e..9d15f1f294 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-59-g8ed1b