[llvm] r373759 - [utils] Fix incompatibility of bisect[-skip-count] with Python 3

Mikhail Maltsev via llvm-commits llvm-commits at lists.llvm.org
Fri Oct 4 09:44:18 PDT 2019


Author: miyuki
Date: Fri Oct  4 09:44:18 2019
New Revision: 373759

URL: http://llvm.org/viewvc/llvm-project?rev=373759&view=rev
Log:
[utils] Fix incompatibility of bisect[-skip-count] with Python 3

Summary:
This change replaces the print statements with print function calls
and also replaces the '/' operator (which is integer division in Py2,
but becomes floating point division in Py3) with the '//' operator
which has the same semantics in Py2 and Py3.

Reviewers: greened, michaelplatings, gottesmm

Reviewed By: greened

Subscribers: llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D68138

Modified:
    llvm/trunk/utils/bisect
    llvm/trunk/utils/bisect-skip-count

Modified: llvm/trunk/utils/bisect
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/bisect?rev=373759&r1=373758&r2=373759&view=diff
==============================================================================
--- llvm/trunk/utils/bisect (original)
+++ llvm/trunk/utils/bisect Fri Oct  4 09:44:18 2019
@@ -12,6 +12,7 @@
 # And bisect will continually call ./script.sh with various counts using
 # the exit status to determine success and failure.
 #
+from __future__ import print_function
 import os
 import sys
 import argparse
@@ -34,10 +35,10 @@ print("End: %d" % end)
 
 last = None
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Count: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'count':count} for x in args.command]
-    print cmd
+    print(cmd)
     result = subprocess.call(cmd)
     if result == 0:
         print("    PASSES! Setting start to count")

Modified: llvm/trunk/utils/bisect-skip-count
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/bisect-skip-count?rev=373759&r1=373758&r2=373759&view=diff
==============================================================================
--- llvm/trunk/utils/bisect-skip-count (original)
+++ llvm/trunk/utils/bisect-skip-count Fri Oct  4 09:44:18 2019
@@ -20,6 +20,7 @@
 # result.  Incrementing the last good count by one or decrementing the
 # last good skip by one should produce a failure.
 #
+from __future__ import print_function
 import os
 import sys
 import argparse
@@ -52,10 +53,10 @@ print("End: %d" % end)
 
 last = None
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Skip: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'skip':count, 'count':-1} for x in args.command]
-    print cmd
+    print(cmd)
     try:
         result = subprocess.call(cmd, shell=args.shell, timeout=args.timeout)
         if result == 0:
@@ -75,10 +76,10 @@ print("Bisect of Count starting!")
 print("Start: %d" % start)
 print("End: %d" % end)
 while start != end and start != end-1:
-    count = start + (end - start)/2
+    count = start + (end - start)//2
     print("Visiting Count: %d with (Start, End) = (%d,%d)" % (count, start, end))
     cmd = [x % {'count':count, 'skip':firstcount } for x in args.command]
-    print cmd
+    print(cmd)
     try:
         result = subprocess.call(cmd, shell=args.shell, timeout=args.timeout)
         if result == 0:




More information about the llvm-commits mailing list