[BE][CI] Merge regular and MPS test config shards (#152719)

Unsure why there were separate to beging with
Pull Request resolved: https://github.com/pytorch/pytorch/pull/152719
Approved by: https://github.com/seemethere, https://github.com/atalman
ghstack dependencies: #153013, #153057

.github/workflows/_mac-test.yml

@@ -234,6 +234,17 @@ jobs:
         run: |
           cat test/**/*_toprint.log || true
 
+      - name: Run OP benchmark
+        shell: bash
+        if: ${{ contains(steps.get-job-id.outputs.job-name, 'mps') }}
+        run: |
+          if [[ -n "$CONDA_ENV" ]]; then
+            # Use binaries under conda environment
+            export PATH="$CONDA_ENV/bin":$PATH
+          fi
+          ${CONDA_RUN} python3 test/bench_mps_ops.py
+
+
       - name: Stop monitoring script
         if: ${{ always() && steps.monitor-script.outputs.monitor-script-pid }}
         continue-on-error: true

.github/workflows/mac-mps.yml

@@ -36,7 +36,7 @@ jobs:
 
   macos-py3-arm64-mps-test:
     name: macos-py3-arm64-mps
-    uses: ./.github/workflows/_mac-test-mps.yml
+    uses: ./.github/workflows/_mac-test.yml
     needs: macos-py3-arm64-build
     with:
       sync-tag: macos-py3-arm64-mps-test

.github/workflows/trunk.yml

@@ -92,21 +92,6 @@ jobs:
           { config: "default", shard: 1, num_shards: 3, runner: "macos-m1-stable" },
           { config: "default", shard: 2, num_shards: 3, runner: "macos-m1-stable" },
           { config: "default", shard: 3, num_shards: 3, runner: "macos-m1-stable" },
-        ]}
-    secrets: inherit
-
-  macos-py3-arm64-mps-test:
-    name: macos-py3-arm64-mps
-    uses: ./.github/workflows/_mac-test-mps.yml
-    needs: macos-py3-arm64-build
-    if: needs.macos-py3-arm64-build.outputs.build-outcome == 'success'
-    with:
-      sync-tag: macos-py3-arm64-mps-test
-      build-environment: macos-py3-arm64
-      # Same as the build job
-      python-version: 3.9.12
-      test-matrix: |
-        { include: [
           { config: "mps", shard: 1, num_shards: 1, runner: "macos-m1-13" },
           { config: "mps", shard: 1, num_shards: 1, runner: "macos-m1-14" },
           { config: "mps", shard: 1, num_shards: 1, runner: "macos-m2-15" },