diff --git a/compiler-rt/lib/tsan/check_analyze.sh b/compiler-rt/lib/tsan/check_analyze.sh
index 08bfc7a76313..4b33393ef648 100755
--- a/compiler-rt/lib/tsan/check_analyze.sh
+++ b/compiler-rt/lib/tsan/check_analyze.sh
@@ -8,17 +8,6 @@ PrintRes() {
 
 PrintRes
 
-wmops="write1 \
-      write2 \
-      write4 \
-      write8"
-rmops="read1 \
-      read2 \
-      read4 \
-      read8"
-func="func_entry \
-      func_exit"
-
 check() {
   res=$(PrintRes | egrep "$1 .* $2 $3; ")
   if [ "$res" == "" ]; then
@@ -27,19 +16,25 @@ check() {
   fi
 }
 
-for f in $wmops; do
-  check $f rsp 3
-  check $f push 1
+for f in write1; do
+  check $f rsp 1
+  check $f push 2
+  check $f pop 2
+done
+
+for f in write2 write4 write8; do
+  check $f rsp 1
+  check $f push 3
+  check $f pop 3
+done
+
+for f in read1 read2 read4 read8; do
+  check $f rsp 1
+  check $f push 5
   check $f pop 5
 done
 
-for f in $rmops; do
-  check $f rsp 3
-  check $f push 1
-  check $f pop 4
-done
-
-for f in $func; do
+for f in func_entry func_exit; do
   check $f rsp 0
   check $f push 0
   check $f pop 0