diff options
| author | Ulyana Trafimovich <skvadrik@google.com> | 2020-07-17 11:53:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-17 11:53:45 +0000 |
| commit | e32cb77c60a0ec5d49b841b488119c1b44ab7167 (patch) | |
| tree | fa9f628918fbab352d2100c494944d15177af251 /compiler/optimizing/codegen_test_utils.h | |
| parent | cee6d7ad66a3ced6fcbb7c71104fafb482bc0c5d (diff) | |
| parent | e1d32d0c70bd13d42b87ed49f1a8262fe58036fa (diff) | |
Revert^2 "VIXL simulator for ART (Stage1)" am: e886d68b9c am: 1dc940d2b6 am: e1d32d0c70
Original change: https://android-review.googlesource.com/c/platform/art/+/1364818
Change-Id: Ic9f12483924a54e52ccf4d9ce5255f726ba64e58
Diffstat (limited to 'compiler/optimizing/codegen_test_utils.h')
| -rw-r--r-- | compiler/optimizing/codegen_test_utils.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/compiler/optimizing/codegen_test_utils.h b/compiler/optimizing/codegen_test_utils.h index 9d15f1f294..f873e7514e 100644 --- a/compiler/optimizing/codegen_test_utils.h +++ b/compiler/optimizing/codegen_test_utils.h @@ -223,12 +223,15 @@ static void VerifyGeneratedCode(InstructionSet target_isa, Expected expected) { ASSERT_TRUE(CanExecute(target_isa)) << "Target isa is not executable."; - // Verify on simulator. - CodeSimulatorContainer simulator(target_isa); - if (simulator.CanSimulate()) { - Expected result = SimulatorExecute<Expected>(simulator.Get(), f); - if (has_result) { - ASSERT_EQ(expected, result); + // 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<Expected>(simulator.Get(), f); + if (has_result) { + ASSERT_EQ(expected, result); + } } } |