commit 254a858ef4f65728f636443b8f9ca3e84310308b
author Vladimir Marko <vmarko@google.com> Mon Nov 29 14:08:37 2021 +0000
committer Vladimir Marko <vmarko@google.com> Tue Nov 30 09:21:08 2021 +0000
tree ea26873f834f6f677b83e05ff035c803c931b3c3
parent 8a608fab3f7479db4b21e7ad13b8f69c21658d32

Make suspend check test specific flags.

Make 20 bits in `Thread.tls32_.state_and_flags` available
for new uses.

Code size changes per suspend check:
  - x86/x86-64: +3B (CMP r/m32, imm8 -> TST r/m32, imm32)
  - arm: none (CMP -> TST, both 32-bit with high register)
  - arm64: +4B (CBNZ/CBZ -> TST+BNE/BEQ)

Note: Using implicit suspend checks on arm64 would sidestep
this code size increase entirely.

Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: run-gtests.sh
Test: testrunner.py --target --optimizing
Bug: 172332525
Change-Id: If5b0be0183efba3f397596b22e03a8b7afb87f85

tools/cpp-define-generator/thread.def

diff --git a/tools/cpp-define-generator/thread.def b/tools/cpp-define-generator/thread.def
index fff5755..6dc6c0e 100644
--- a/tools/cpp-define-generator/thread.def
+++ b/tools/cpp-define-generator/thread.def
@@ -21,10 +21,6 @@
 
 ASM_DEFINE(THREAD_CARD_TABLE_OFFSET,
            art::Thread::CardTableOffset<art::kRuntimePointerSize>().Int32Value())
-ASM_DEFINE(THREAD_CHECKPOINT_REQUEST,
-           static_cast<uint32_t>(art::ThreadFlag::kCheckpointRequest))
-ASM_DEFINE(THREAD_EMPTY_CHECKPOINT_REQUEST,
-           static_cast<uint32_t>(art::ThreadFlag::kEmptyCheckpointRequest))
 ASM_DEFINE(THREAD_EXCEPTION_OFFSET,
            art::Thread::ExceptionOffset<art::kRuntimePointerSize>().Int32Value())
 ASM_DEFINE(THREAD_FLAGS_OFFSET,
@@ -56,9 +52,7 @@
 ASM_DEFINE(THREAD_SELF_OFFSET,
            art::Thread::SelfOffset<art::kRuntimePointerSize>().Int32Value())
 ASM_DEFINE(THREAD_SUSPEND_OR_CHECKPOINT_REQUEST,
-           static_cast<uint32_t>(art::ThreadFlag::kSuspendRequest) |
-               static_cast<uint32_t>(art::ThreadFlag::kCheckpointRequest) |
-               static_cast<uint32_t>(art::ThreadFlag::kEmptyCheckpointRequest))
+           art::Thread::SuspendOrCheckpointRequestFlags())
 ASM_DEFINE(THREAD_SUSPEND_REQUEST,
            static_cast<uint32_t>(art::ThreadFlag::kSuspendRequest))
 ASM_DEFINE(THREAD_TOP_QUICK_FRAME_OFFSET,