Fix Python3 usage with perf tests/gold tests.

Bug: angleproject:6733
Change-Id: I9d1baf78ed182db77c6a6d8e896737413ca417f3
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3304012
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

.vpython3

@@ -28,7 +28,7 @@ python_version: "3.8"
 # become available.
 wheel: <
   name: "infra/python/wheels/six-py2_py3"
-  version: "version:1.10.0"
+  version: "version:1.15.0"
 >
 
 wheel: <

infra/specs/gn_isolate_map.pyl

@@ -107,13 +107,11 @@
     "type": "script",
   },
   "angle_perftests": {
-    "python3": False,
     "label": "//src/tests:angle_perftests",
     "script": "//src/tests/run_perf_tests.py",
     "type": "script",
   },
   "angle_restricted_trace_gold_tests": {
-    "python3": False,
     "label": "//src/tests/restricted_traces:angle_restricted_trace_gold_tests",
     "script": "//src/tests/restricted_traces/restricted_trace_gold_tests.py",
     "type": "script",
@@ -124,7 +122,6 @@
     "type": "script",
   },
   "angle_white_box_perftests": {
-    "python3": False,
     "label": "//src/tests:angle_white_box_tests",
     "script": "//src/tests/run_perf_tests.py",
     "type": "script",

src/tests/restricted_traces/restricted_trace_gold_tests.py

@@ -1,15 +1,4 @@
-#! /usr/bin/env vpython
-#
-# [VPYTHON:BEGIN]
-# wheel: <
-#  name: "infra/python/wheels/psutil/${vpython_platform}"
-#  version: "version:5.2.2"
-# >
-# wheel: <
-#  name: "infra/python/wheels/six-py2_py3"
-#  version: "version:1.10.0"
-# >
-# [VPYTHON:END]
+#! /usr/bin/env vpython3
 #
 # Copyright 2020 The ANGLE Project Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be

src/tests/run_perf_tests.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env vpython
+#! /usr/bin/env vpython3
 #
 # Copyright 2021 The ANGLE Project Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -9,6 +9,7 @@
 
 import argparse
 import fnmatch
+import importlib
 import io
 import json
 import logging
@@ -297,7 +298,7 @@ def main():
 
     args, extra_flags = parser.parse_known_args()
 
-    reload(logging)
+    importlib.reload(logging)
     logging.basicConfig(level=args.log.upper())
 
     start_time = time.time()

src/tests/skia_gold/angle_skia_gold_session_manager.py

@@ -14,7 +14,7 @@ CHROMIUM_SRC_DIR = d(d(ANGLE_SRC_DIR))
 sys.path.insert(0, os.path.join(CHROMIUM_SRC_DIR, 'build'))
 
 from skia_gold_common import skia_gold_session_manager as sgsm
-import angle_skia_gold_session
+from .angle_skia_gold_session import ANGLESkiaGoldSession
 
 
 class ANGLESkiaGoldSessionManager(sgsm.SkiaGoldSessionManager):
@@ -25,4 +25,4 @@ class ANGLESkiaGoldSessionManager(sgsm.SkiaGoldSessionManager):
 
     @staticmethod
     def GetSessionClass():
-        return angle_skia_gold_session.ANGLESkiaGoldSession
+        return ANGLESkiaGoldSession