From 4ff7ed15d94ab1165a7ed6627da61048a094dee3 Mon Sep 17 00:00:00 2001 From: Samarth Agarwal Date: Fri, 8 Nov 2024 19:30:22 +0000 Subject: [PATCH] #0: More test structuring --- CONTRIBUTING.md | 2 +- tests/scripts/run_testpoint_perprocess.py | 2 +- tests/scripts/t3000/run_t3000_unit_tests.sh | 4 ++-- tests/scripts/tg/run_tg_unit_tests.sh | 8 ++++---- tests/scripts/tgg/run_tgg_unit_tests.sh | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b34119280b6..4839a39fab5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -263,7 +263,7 @@ On slow dispatch, to run another specific test, the equivalent would be: 2. Run with the slow dispatch mode: ``` export TT_METAL_SLOW_DISPATCH_MODE=1 - ./build/test/tt_metal/unit_tests/fast_dispatch --gtest_filter="DeviceSingleCardBufferFixture.TestL1BuffersAllocatedTopDown" + ./build/test/tt_metal/unit_tests/unit_tests_api --gtest_filter="DeviceSingleCardBufferFixture.TestL1BuffersAllocatedTopDown" ``` We have split our tests into the two dispatch modes for less pollution of state diff --git a/tests/scripts/run_testpoint_perprocess.py b/tests/scripts/run_testpoint_perprocess.py index 8a2feb156bb..3d2c4a88e9d 100755 --- a/tests/scripts/run_testpoint_perprocess.py +++ b/tests/scripts/run_testpoint_perprocess.py @@ -13,7 +13,7 @@ DEBUG = False TT_METAL_HOME = os.environ["TT_METAL_HOME"] -DEFAULT_GTEST = f"{TT_METAL_HOME}/build/test/tt_metal/unit_tests" +DEFAULT_GTEST = f"{TT_METAL_HOME}/build/test/tt_metal/unit_tests_api" def extract_list_of_test_points(args: argparse.Namespace): diff --git a/tests/scripts/t3000/run_t3000_unit_tests.sh b/tests/scripts/t3000/run_t3000_unit_tests.sh index 5cd8c12883c..fcf34934903 100755 --- a/tests/scripts/t3000/run_t3000_unit_tests.sh +++ b/tests/scripts/t3000/run_t3000_unit_tests.sh @@ -12,8 +12,8 @@ run_t3000_ttmetal_tests() { TT_METAL_SLOW_DISPATCH_MODE=1 ./build/test/tt_metal/unit_tests_eth --gtest_filter="DeviceFixture.ActiveEthKernelsSendInterleavedBufferAllConnectedChips" ; fail+=$? TT_METAL_SLOW_DISPATCH_MODE=1 ./build/test/tt_metal/unit_tests_eth --gtest_filter="DeviceFixture.ActiveEthKernelsDirectRingGatherAllChips" ; fail+=$? TT_METAL_SLOW_DISPATCH_MODE=1 ./build/test/tt_metal/unit_tests_eth --gtest_filter="DeviceFixture.ActiveEthKernelsInterleavedRingGatherAllChips" ; fail+=$? - TT_METAL_ENABLE_REMOTE_CHIP=1 ./build/test/tt_metal/unit_tests_fast_dispatch --gtest_filter="CommandQueueSingleCard.*Fixture.*" ; fail+=$? - ./build/test/tt_metal/unit_tests_fast_dispatch --gtest_filter="CommandQueueMultiDevice.*Fixture.*" ; fail+=$? + TT_METAL_ENABLE_REMOTE_CHIP=1 ./build/test/tt_metal/unit_tests_dispatch --gtest_filter="CommandQueueSingleCard.*Fixture.*" ; fail+=$? + ./build/test/tt_metal/unit_tests_dispatch --gtest_filter="CommandQueueMultiDevice.*Fixture.*" ; fail+=$? ./build/test/tt_metal/unit_tests_debug_tools --gtest_filter="DPrintFixture.*:WatcherFixture.*" ; fail+=$? # Record the end time diff --git a/tests/scripts/tg/run_tg_unit_tests.sh b/tests/scripts/tg/run_tg_unit_tests.sh index 52ad5748558..05046bb8c3f 100755 --- a/tests/scripts/tg/run_tg_unit_tests.sh +++ b/tests/scripts/tg/run_tg_unit_tests.sh @@ -5,11 +5,11 @@ run_tg_tests() { echo "LOG_METAL: running run_tg_unit_tests" - TT_METAL_ENABLE_REMOTE_CHIP=1 ./build/test/tt_metal/unit_tests_fast_dispatch --gtest_filter="CommandQueueSingleCardFixture.*" + TT_METAL_ENABLE_REMOTE_CHIP=1 ./build/test/tt_metal/unit_tests_dispatch --gtest_filter="CommandQueueSingleCard.*Fixture.*" ./build/test/ttnn/galaxy_unit_tests_ttnn - TT_METAL_SLOW_DISPATCH_MODE=1 ./build/test/tt_metal/unit_tests_galaxy --gtest_filter="GalaxyFixture.*:TGFixture.*" - ./build/test/tt_metal/unit_tests_galaxy --gtest_filter="GalaxyFixture.*:TGFixture.*" - TT_METAL_GTEST_NUM_HW_CQS=2 ./build/test/tt_metal/unit_tests_fast_dispatch_single_chip_multi_queue --gtest_filter="MultiCommandQueueMultiDeviceFixture.*" + TT_METAL_SLOW_DISPATCH_MODE=1 ./build/test/tt_metal/unit_tests_multichip --gtest_filter="GalaxyFixture.*:TGFixture.*" + ./build/test/tt_metal/unit_tests_multichip --gtest_filter="GalaxyFixture.*:TGFixture.*" + TT_METAL_GTEST_NUM_HW_CQS=2 ./build/test/tt_metal/unit_tests_dispatch --gtest_filter="MultiCommandQueueMultiDevice.*Fixture.*" } diff --git a/tests/scripts/tgg/run_tgg_unit_tests.sh b/tests/scripts/tgg/run_tgg_unit_tests.sh index 08f8f08c421..dca480b4d36 100755 --- a/tests/scripts/tgg/run_tgg_unit_tests.sh +++ b/tests/scripts/tgg/run_tgg_unit_tests.sh @@ -5,10 +5,10 @@ run_tgg_tests() { echo "LOG_METAL: running run_tgg_unit_tests" - TT_METAL_ENABLE_REMOTE_CHIP=1 ./build/test/tt_metal/unit_tests_fast_dispatch --gtest_filter="CommandQueueSingleCardFixture.*" + TT_METAL_ENABLE_REMOTE_CHIP=1 ./build/test/tt_metal/unit_tests_dispatch --gtest_filter="CommandQueueSingleCard.*Fixture.*" ./build/test/ttnn/galaxy_unit_tests_ttnn - TT_METAL_SLOW_DISPATCH_MODE=1 ./build/test/tt_metal/unit_tests_galaxy --gtest_filter="GalaxyFixture.*:TGGFixture.*" - ./build/test/tt_metal/unit_tests_galaxy --gtest_filter="GalaxyFixture.*:TGGFixture.*" + TT_METAL_SLOW_DISPATCH_MODE=1 ./build/test/tt_metal/unit_tests_multichip --gtest_filter="GalaxyFixture.*:TGGFixture.*" + ./build/test/tt_metal/unit_tests_multichip --gtest_filter="GalaxyFixture.*:TGGFixture.*" pytest -s tests/ttnn/distributed/test_mesh_device_TGG.py }