aboutsummaryrefslogtreecommitdiff
path: root/src/runtime/testdata
diff options
context:
space:
mode:
authorCherry Zhang <cherryyz@google.com>2019-12-02 22:56:40 -0500
committerCherry Zhang <cherryyz@google.com>2019-12-06 01:11:02 +0000
commita037582efff56082631508b15b287494df6e9b69 (patch)
tree132a1e965ef690169491062ae8f69d407e35e595 /src/runtime/testdata
parent7673884a7fe831ab8b8cf43a3ae74e12c9a44fbf (diff)
downloadgo-a037582efff56082631508b15b287494df6e9b69.tar.gz
go-a037582efff56082631508b15b287494df6e9b69.zip
cmd/compile: mark empty block preemptible
Currently, a block's control instruction gets the liveness info of the last Value in the block. However, for an empty block, the control instruction gets the invalid liveness info and therefore not preemptible. One example is empty infinite loop, which has only a control instruction. The control instruction being non- preemptible makes the whole loop non-preemptible. Fix this by using a different, preemptible liveness info for empty block's control. We can choose an arbitrary preemptible liveness info, as at run time we don't really use the liveness map at that instruction. As before, if the last Value in the block is non-preemptible, so is the block control. For example, the conditional branch in the write barrier test block is still non-preemptible. Also, only update liveness info if we are actually emitting instructions. So zero-width Values' liveness info (which are always invalid) won't affect the block control's liveness info. For example, if the last Values in a block is a tuple-generating operation and a Select, the block control instruction is still preemptible. Fixes #35923. Change-Id: Ic5225f3254b07e4955f7905329b544515907642b Reviewed-on: https://go-review.googlesource.com/c/go/+/209659 Run-TryBot: Cherry Zhang <cherryyz@google.com> Reviewed-by: David Chase <drchase@google.com>
Diffstat (limited to 'src/runtime/testdata')
-rw-r--r--src/runtime/testdata/testprog/preempt.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/runtime/testdata/testprog/preempt.go b/src/runtime/testdata/testprog/preempt.go
index 1454095cde..1c74d0e435 100644
--- a/src/runtime/testdata/testprog/preempt.go
+++ b/src/runtime/testdata/testprog/preempt.go
@@ -34,13 +34,19 @@ func AsyncPreempt() {
// This is an especially interesting case for
// LR machines.
go func() {
- atomic.StoreUint32(&ready2, 1)
+ atomic.AddUint32(&ready2, 1)
frameless()
}()
+ // Also test empty infinite loop.
+ go func() {
+ atomic.AddUint32(&ready2, 1)
+ for {
+ }
+ }()
// Wait for the goroutine to stop passing through sync
// safe-points.
- for atomic.LoadUint32(&ready) == 0 || atomic.LoadUint32(&ready2) == 0 {
+ for atomic.LoadUint32(&ready) == 0 || atomic.LoadUint32(&ready2) < 2 {
runtime.Gosched()
}