iris/ci: Simplify performance trace template

The `.profile-traces` template was nearly identical to
`.piglit-performance-base`, differing only by one additional variable.

Since all jobs extending `.piglit-performance-base` were already using
`EGL_PLATFORM: surfaceless`, that setting has been moved into the base
template, allowing `.profile-traces` to be simplified.

This also hides the performance traces jobs from non-Marge pipelines,
as intended.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36074>

.gitlab-ci/test-source-dep.yml

@@ -116,6 +116,8 @@
     FDO_CI_CONCURRENT: 1
     # Piglit is very sparse in its status output and downloads of big traces can take a while
     DEVICE_HANGING_TIMEOUT_SEC: 600
+    # So we aren't capped by VSync by the X server
+    EGL_PLATFORM: surfaceless
     GIT_STRATEGY: none
     HWCI_FREQ_MAX: "true"
     # Always use the same device

src/intel/ci/gitlab-ci-inc.yml

@@ -125,10 +125,6 @@
     - changes:
         *iris_file_list
       when: manual
-  allow_failure: true # see comment in .performance-rules, which we don't inherit this line from.
-  variables:
-    JOB_PRIORITY: 40
-    S3_ARTIFACT_NAME: mesa-x86_64-default-release
   needs:
     - job: debian/x86_64_test-gl
       optional: true
@@ -435,22 +431,10 @@
   extends:
     - .iris-traces
     - .iris-rules-performance
-  variables:
+    - .piglit-performance-base
-    PIGLIT_REPLAY_SUBCOMMAND: "profile"
+  rules:
-    PIGLIT_REPLAY_EXTRA_ARGS: "--db-path ${CI_PROJECT_DIR}/replayer-db/"
+    - !reference [.piglit-performance-base, rules]
-    # More than this can hit OOM due to BOs leaked during the replay of the last frame
+    - !reference [.iris-rules-performance, rules]
-    PIGLIT_REPLAY_LOOP_TIMES: 150
-    # We don't want for more than one workload to be submitted to the GPU at a time
-    FDO_CI_CONCURRENT: 1
-    # Piglit is very sparse in its status output and downloads of big traces can take a while
-    DEVICE_HANGING_TIMEOUT_SEC: 600
-    # So we aren't capped by VSync by the X server
-    EGL_PLATFORM: surfaceless
-    GIT_STRATEGY: none
-    HWCI_FREQ_MAX: "true"
-    LAVA_TAGS: "cbg-0"
-    # Ensure that we are using the release build artifact
-    S3_ARTIFACT_NAME: mesa-x86_64-default-release
 
 .iris-whl-traces-performance:
   extends: