diff options
author | 2021-11-22 16:31:57 +0000 | |
---|---|---|
committer | 2021-11-25 09:26:35 +0000 | |
commit | ddf4fd3c37af160b5a1f7e83212b837f50e13e81 (patch) | |
tree | 61f9223f33f3191f6e6416d717a3a13405235413 /runtime/monitor_test.cc | |
parent | c3e004d1c8c58c1311beb1bcdd8211f5d4d5a009 (diff) |
Always access Thread state and flags as 32-bit location.
Rewrite access to Thread's state and flags to use 32-bit
atomic operations. Avoid `volatile` accesses that prevent
compiler optimizations.
Change `ThreadState` and `ThreadFlag` to `enum class`es.
Golem results for art-opt-cc (higher is better):
linux-ia32 before after
NativeDowncallStaticNormal 28.162 35.323 (+25.43%)
NativeDowncallStaticNormal6 26.447 32.951 (+24.59%)
NativeDowncallStaticNormalRefs6
NativeDowncallVirtualNormal 27.972 35.027 (+25.22%)
NativeDowncallVirtualNormal6 26.096 32.131 (+23.13%)
NativeDowncallVirtualNormalRefs6 25.922 31.873 (+22.95%)
linux-x64 before after
NativeDowncallStaticNormal 26.987 34.380 (+27.40%)
NativeDowncallStaticNormal6 25.424 31.096 (+22.31%)
NativeDowncallStaticNormalRefs6 25.086 30.602 (+21.99%)
NativeDowncallVirtualNormal 26.812 33.234 (+23.95%)
NativeDowncallVirtualNormal6 25.086 30.617 (+22.05%)
NativeDowncallVirtualNormalRefs6 25.086 30.602 (+21.99%)
linux-armv7 before after
NativeDowncallStaticNormal 7.2394 7.9523 (+9.848%)
NativeDowncallStaticNormal6 6.8527 7.4888 (+9.283%)
NativeDowncallStaticNormalRefs6 6.3976 6.9444 (+8.547%)
NativeDowncallVirtualNormal 7.2081 7.9130 (+9.779%)
NativeDowncallVirtualNormal6 6.8527 7.4888 (+9.283%)
NativeDowncallVirtualNormalRefs6 6.3168 6.8527 (+8.483%)
linux-armv8 before after
NativeDowncallStaticNormal 7.0389 7.5973 (+7.933%)
NativeDowncallStaticNormal6 6.8527 7.3783 (+7.670%)
NativeDowncallStaticNormalRefs6 6.2924 6.8226 (+8.427%)
NativeDowncallVirtualNormal 6.8527 7.3783 (+7.670%)
NativeDowncallVirtualNormal6 6.5604 7.0423 (+7.344%)
NativeDowncallVirtualNormalRefs6 6.1408 6.5329 (+6.386%)
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: run-gtests.sh
Test: testrunner.py --target --optimizing --interpreter
Bug: 172332525
Bug: 143299880
Change-Id: Ib55d457ad8f5d9e1159b681dfd279d1f9cfb2af7
Diffstat (limited to 'runtime/monitor_test.cc')
-rw-r--r-- | runtime/monitor_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/monitor_test.cc b/runtime/monitor_test.cc index 8ddd50f031..66008f3ff2 100644 --- a/runtime/monitor_test.cc +++ b/runtime/monitor_test.cc @@ -265,7 +265,7 @@ static void CommonWaitSetup(MonitorTest* test, ClassLinker* class_linker, uint64 } // Need to drop the mutator lock to allow barriers. - ScopedThreadSuspension sts(soa.Self(), kNative); + ScopedThreadSuspension sts(soa.Self(), ThreadState::kNative); ThreadPool thread_pool(pool_name, 3); thread_pool.AddTask(self, new CreateTask(test, create_sleep, c_millis, c_expected)); if (interrupt) { @@ -361,7 +361,7 @@ TEST_F(MonitorTest, TestTryLock) { // Test failure case. thread_pool.AddTask(self, new TryLockTask(obj1)); thread_pool.StartWorkers(self); - ScopedThreadSuspension sts(self, kSuspended); + ScopedThreadSuspension sts(self, ThreadState::kSuspended); thread_pool.Wait(Thread::Current(), /*do_work=*/false, /*may_hold_locks=*/false); } // Test that the trylock actually locks the object. |