Install trace_processor_shell as a part of setup

Signed-off-by: David Galiffi <[email protected]>
ROCm · Sep 9, 2024 · c30fdac · c30fdac
1 parent e68c926
commit c30fdac
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml
@@ -58,10 +58,12 @@ jobs:
         timeout_minutes: 25
         max_attempts: 5
         command: |
+          wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin/trace_processor_shell &&
+          chmod +x /opt/trace_processor/bin/trace_processor_shell
           python3 -m pip install --upgrade pip &&
-          python3 -m pip install --upgrade numpy perfetto dataclasses &&
+          python3 -m pip install --upgrade numpy perfetto dataclasses protobuf &&
           python3 -m pip install 'cmake==3.21.4' &&
-          for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done
+          for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses protobuf; done
 
     - name: Configure Env
       run:

diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml
@@ -70,10 +70,12 @@ jobs:
     - name: Install Packages
       shell: bash
       run: |
+          wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin/trace_processor_shell &&
+          chmod +x /opt/trace_processor/bin/trace_processor_shell
           python3 -m pip install --upgrade pip &&
-          python3 -m pip install --upgrade numpy perfetto dataclasses &&
+          python3 -m pip install --upgrade numpy perfetto dataclasses protobuf &&
           python3 -m pip install 'cmake==3.21.4' &&
-          for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done
+          for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses protobuf; done
 
     - name: Install ROCm Packages
       if: ${{ matrix.rocm-version > 0 }}

diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml
@@ -110,10 +110,12 @@ jobs:
           apt-get install -y software-properties-common &&
           apt-get upgrade -y &&
           apt-get install -y build-essential m4 autoconf libtool python3-pip libiberty-dev clang libomp-dev libopenmpi-dev libfabric-dev openmpi-bin environment-modules ${{ matrix.compiler }} &&
+          wget https://commondatastorage.googleapis.com/perfetto-luci-artifacts/v46.0/linux-amd64/trace_processor_shell -P /opt/trace_processor/bin/trace_processor_shell &&
+          chmod +x /opt/trace_processor/bin/trace_processor_shell &&
           python3 -m pip install --upgrade pip &&
-          python3 -m pip install --upgrade numpy perfetto dataclasses &&
+          python3 -m pip install --upgrade numpy perfetto dataclasses protobuf &&
           python3 -m pip install 'cmake==3.21.4' &&
-          for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done
+          for i in 6 7 8 9 10; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses protobuf; done
 
     - name: Install ROCm Packages
       timeout-minutes: 25

diff --git a/tests/omnitrace-python-tests.cmake b/tests/omnitrace-python-tests.cmake
@@ -167,7 +167,7 @@ foreach(_VERSION ${OMNITRACE_PYTHON_VERSIONS})
             COMMAND
                 ${_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/validate-perfetto-proto.py
                 -m ${TEST_PERFETTO_METRIC} ${TEST_ARGS} -p -t
-                ${OMNITRACE_PERFETTO_BINARY_DIR}/trace_processor_shell -i
+                /opt/trace_processor/bin/trace_processor_shell -i
             PYTHON_VERSION ${_VERSION}
             FILE omnitrace-tests-output/${TEST_NAME}/${_VERSION}/${TEST_PERFETTO_FILE}
             DEPENDS ${TEST_NAME}-${_VERSION}

diff --git a/tests/omnitrace-testing.cmake b/tests/omnitrace-testing.cmake
@@ -985,7 +985,7 @@ function(OMNITRACE_ADD_VALIDATION_TEST)
                 ${CMAKE_CURRENT_LIST_DIR}/validate-perfetto-proto.py -m
                 "${TEST_PERFETTO_METRIC}" ${TEST_ARGS} -i
                 ${PROJECT_BINARY_DIR}/omnitrace-tests-output/${TEST_NAME}/${TEST_PERFETTO_FILE}
-                -t ${OMNITRACE_PERFETTO_BINARY_DIR}/trace_processor_shell
+                -t /opt/trace_processor/bin/trace_processor_shell
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
     endif()