infra: Add isolated script tests to Pixel 4.

infra/specs/angle.json

@@ -370,6 +370,91 @@
         "test_id_prefix": "ninja://src/tests:angle_unittests/",
         "use_isolated_scripts_api": true
       }
+    ],
+    "isolated_scripts": [
+      {
+        "args": [
+          "angle_perftests",
+          "--non-telemetry=true",
+          "--gtest-benchmark-name=angle_perftests",
+          "-v",
+          "--one-frame-only",
+          "--test-timeout=100",
+          "--test-launcher-batch-limit=1"
+        ],
+        "isolate_name": "angle_perftests",
+        "merge": {
+          "args": [
+            "--smoke-test-mode"
+          ],
+          "script": "//tools/perf/process_perf_results.py"
+        },
+        "name": "angle_perftests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "device_os": "R",
+              "device_os_type": "userdebug",
+              "device_type": "flame",
+              "os": "Android",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 6
+        },
+        "test_id_prefix": "ninja://src/tests:angle_perftests/"
+      },
+      {
+        "args": [
+          "--test-machine-name",
+          "${buildername}",
+          "-v",
+          "--git-revision=${got_angle_revision}"
+        ],
+        "isolate_name": "angle_restricted_trace_gold_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "angle_restricted_trace_gold_tests",
+        "precommit_args": [
+          "--gerrit-issue=${patch_issue}",
+          "--gerrit-patchset=${patch_set}",
+          "--buildbucket-id=${buildbucket_build_id}"
+        ],
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "containment_type": "AUTO",
+          "dimension_sets": [
+            {
+              "device_os": "R",
+              "device_os_type": "userdebug",
+              "device_type": "flame",
+              "os": "Android",
+              "pool": "chromium.tests.gpu"
+            }
+          ],
+          "service_account": "chrome-gpu-gold@chops-service-accounts.iam.gserviceaccount.com"
+        },
+        "test_id_prefix": "ninja://src/tests/restricted_traces:angle_restricted_trace_gold_tests/"
+      }
     ]
   },
   "linux-builder": {},

infra/specs/waterfalls.pyl

@@ -30,7 +30,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'android_gtests',
-          # 'isolated_scripts': 'common_isolated_scripts',
+          'isolated_scripts': 'common_isolated_scripts',
         },
       },
       'linux-builder': {},

scripts/code_generation_hashes/Test_spec_JSON.json

 {
   "infra/specs/angle.json":
-    "e5d93c670d2620f8ed0b425fdd98aa88",
+    "1d195613e07df4010e92b580255cf9ef",
   "infra/specs/generate_test_spec_json.py":
     "e1c8a771f751adad715d7bea900fc8e1",
   "infra/specs/mixins.pyl":
@@ -12,7 +12,7 @@
   "infra/specs/variants.pyl":
     "8cfcaa99fa07ad2a2d5d14f220fd5037",
   "infra/specs/waterfalls.pyl":
-    "566240ddb77f3418f2ea7d5c8e170026",
+    "fee8d5386149cf4b347eaa9036eb3d0d",
   "testing/buildbot/generate_buildbot_json.py":
     "2aac14060bb7d6cc68f5404ea3e9f5ba",
   "testing/buildbot/mixins.pyl":

src/libANGLE/renderer/driver_utils.h

@@ -42,6 +42,7 @@ enum AndroidDeviceID : uint32_t
     ANDROID_DEVICE_ID_NEXUS5X     = 0x4010800,
     ANDROID_DEVICE_ID_PIXEL2      = 0x5040001,
     ANDROID_DEVICE_ID_PIXEL1XL    = 0x5030004,
+    ANDROID_DEVICE_ID_PIXEL4      = 0x6040001,
     ANDROID_DEVICE_ID_SWIFTSHADER = 0xC0DE,
 };
 
@@ -120,6 +121,11 @@ inline bool IsPixel2(uint32_t vendorId, uint32_t deviceId)
     return IsQualcomm(vendorId) && deviceId == ANDROID_DEVICE_ID_PIXEL2;
 }
 
+inline bool IsPixel4(uint32_t vendorId, uint32_t deviceId)
+{
+    return IsQualcomm(vendorId) && deviceId == ANDROID_DEVICE_ID_PIXEL4;
+}
+
 inline bool IsSwiftshader(uint32_t vendorId, uint32_t deviceId)
 {
     return IsGoogle(vendorId) && deviceId == ANDROID_DEVICE_ID_SWIFTSHADER;

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -2367,11 +2367,12 @@ void RendererVk::initFeatures(DisplayVk *displayVk,
     ANGLE_FEATURE_CONDITION(&mFeatures, enablePreRotateSurfaces,
                             IsAndroid() && supportsNegativeViewport);
 
-    // Currently disabled by default: http://anglebug.com/3078
+    // http://anglebug.com/3078
     ANGLE_FEATURE_CONDITION(
         &mFeatures, enablePrecisionQualifiers,
         !(IsPixel2(mPhysicalDeviceProperties.vendorID, mPhysicalDeviceProperties.deviceID) &&
-          (mPhysicalDeviceProperties.driverVersion < kPixel2DriverWithRelaxedPrecision)));
+          (mPhysicalDeviceProperties.driverVersion < kPixel2DriverWithRelaxedPrecision)) &&
+            !IsPixel4(mPhysicalDeviceProperties.vendorID, mPhysicalDeviceProperties.deviceID));
 
     ANGLE_FEATURE_CONDITION(&mFeatures, preferAggregateBarrierCalls, isNvidia || isAMD || isIntel);
 

src/tests/perf_tests/TracePerfTest.cpp

@@ -895,7 +895,7 @@ TracePerfTest::TracePerfTest()
     // Adreno gives a driver error with empty/small draw calls. http://anglebug.com/5823
     if (param.testID == RestrictedTraceID::hill_climb_racing)
     {
-        if (IsAndroid() && IsPixel2() && param.driver == GLESDriverType::SystemEGL)
+        if (IsAndroid() && (IsPixel2() || IsPixel4()) && param.driver == GLESDriverType::SystemEGL)
         {
             mSkipTest = true;
         }