Avoid ThreadStress timeout with art-read-barrier-table-lookup.
Disable MarkFromReadBarrierWithMeasurements for
art-read-barrier-table-lookup to avoid slowdown as it takes more read
barrier slow paths than art-read-barrier.
Increase the timeout.
Bug: 31679493
Bug: 12687968
Test: test-art-host with ART_READ_BARRIER_TYPE=TABLELOOKUP
Change-Id: I1a87864448e28099e522dc7fedce2208189248f2
diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h
index b229be4..72d7df3 100644
--- a/cmdline/cmdline_types.h
+++ b/cmdline/cmdline_types.h
@@ -507,7 +507,8 @@
bool verify_pre_gc_rosalloc_ = kIsDebugBuild;
bool verify_pre_sweeping_rosalloc_ = false;
bool verify_post_gc_rosalloc_ = false;
- bool measure_ = kIsDebugBuild;
+ // Do no measurements for kUseTableLookupReadBarrier to avoid test timeouts. b/31679493
+ bool measure_ = kIsDebugBuild && !kUseTableLookupReadBarrier;
bool gcstress_ = false;
};
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index d8f42a2..3535f32 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -44,7 +44,7 @@
TIME_OUT="gdb" # "n" (disabled), "timeout" (use timeout), "gdb" (use gdb)
# Value in seconds
if [ "$ART_USE_READ_BARRIER" = "true" ]; then
- TIME_OUT_VALUE=1800 # 30 minutes.
+ TIME_OUT_VALUE=2400 # 40 minutes.
else
TIME_OUT_VALUE=1200 # 20 minutes.
fi
