-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prepend DPrint messages with device id, core coords, and RISC (#15790)
### Ticket #14487
- Loading branch information
1 parent
4b4fa3d
commit ce20864
Showing
8 changed files
with
215 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
tests/tt_metal/tt_metal/debug_tools/dprint/test_print_prepend_device_core_risc.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| // SPDX-FileCopyrightText: © 2024 Tenstorrent Inc. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| #include <string> | ||
| #include <vector> | ||
| #include "core_coord.hpp" | ||
| #include "debug_tools_fixture.hpp" | ||
| #include "gtest/gtest.h" | ||
| #include "debug_tools_test_utils.hpp" | ||
| #include "kernels/kernel_types.hpp" | ||
| #include "tt_metal/detail/tt_metal.hpp" | ||
| #include "tt_metal/host_api.hpp" | ||
|
|
||
| //////////////////////////////////////////////////////////////////////////////// | ||
| // A test for checking that prints are prepended with their corresponding device, core and RISC. | ||
| //////////////////////////////////////////////////////////////////////////////// | ||
| using namespace tt; | ||
| using namespace tt::tt_metal; | ||
|
|
||
| namespace { | ||
| namespace CMAKE_UNIQUE_NAMESPACE { | ||
| static void UpdateGoldenOutput(std::vector<string>& golden_output, const Device* device, const string& risc) { | ||
| // Using wildcard characters in lieu of actual values for the physical coordinates as physical coordinates can vary | ||
| // by machine | ||
| const string& device_core_risc = std::to_string(device->id()) + ":(x=*,y=*):" + risc + ": "; | ||
|
|
||
| const string& output_line_all_riscs = device_core_risc + "Printing on a RISC."; | ||
| golden_output.push_back(output_line_all_riscs); | ||
|
|
||
| if (risc != "ER") { | ||
| const string& output_line_risc = device_core_risc + "Printing on " + risc + "."; | ||
| golden_output.push_back(output_line_risc); | ||
| } | ||
| } | ||
|
|
||
| static void RunTest(DPrintFixture* fixture, Device* device, const bool add_active_eth_kernel = false) { | ||
| std::vector<string> golden_output; | ||
|
|
||
| CoreRange cores({0, 0}, {0, 1}); | ||
| Program program = Program(); | ||
|
|
||
| KernelHandle brisc_kernel_id = CreateKernel( | ||
| program, | ||
| "tests/tt_metal/tt_metal/test_kernels/misc/print_simple.cpp", | ||
| cores, | ||
| DataMovementConfig{.processor = DataMovementProcessor::RISCV_0, .noc = NOC::RISCV_0_default}); | ||
|
|
||
| KernelHandle ncrisc_kernel_id = CreateKernel( | ||
| program, | ||
| "tests/tt_metal/tt_metal/test_kernels/misc/print_simple.cpp", | ||
| cores, | ||
| DataMovementConfig{.processor = DataMovementProcessor::RISCV_1, .noc = NOC::RISCV_1_default}); | ||
|
|
||
| KernelHandle trisc_kernel_id = | ||
| CreateKernel(program, "tests/tt_metal/tt_metal/test_kernels/misc/print_simple.cpp", cores, ComputeConfig{}); | ||
|
|
||
| for (const CoreCoord& core : cores) { | ||
| UpdateGoldenOutput(golden_output, device, "BR"); | ||
| UpdateGoldenOutput(golden_output, device, "NC"); | ||
| UpdateGoldenOutput(golden_output, device, "TR0"); | ||
| UpdateGoldenOutput(golden_output, device, "TR1"); | ||
| UpdateGoldenOutput(golden_output, device, "TR2"); | ||
| } | ||
|
|
||
| if (add_active_eth_kernel) { | ||
| const std::unordered_set<CoreCoord>& active_eth_cores = device->get_active_ethernet_cores(true); | ||
| CoreRangeSet crs(std::set<CoreRange>(active_eth_cores.begin(), active_eth_cores.end())); | ||
| KernelHandle erisc_kernel_id = CreateKernel( | ||
| program, | ||
| "tests/tt_metal/tt_metal/test_kernels/misc/print_simple.cpp", | ||
| crs, | ||
| EthernetConfig{.noc = NOC::NOC_0}); | ||
|
|
||
| for (const CoreCoord& core : active_eth_cores) { | ||
| UpdateGoldenOutput(golden_output, device, "ER"); | ||
| } | ||
| } | ||
|
|
||
| fixture->RunProgram(device, program); | ||
|
|
||
| // Check the print log against golden output. | ||
| EXPECT_TRUE(FileContainsAllStrings(DPrintFixture::dprint_file_name, golden_output)); | ||
| } | ||
| } // namespace CMAKE_UNIQUE_NAMESPACE | ||
| } // namespace | ||
|
|
||
| TEST_F(DPrintFixture, TensixTestPrintPrependDeviceCoreRisc) { | ||
| tt::llrt::RunTimeOptions::get_instance().set_feature_prepend_device_core_risc( | ||
| tt::llrt::RunTimeDebugFeatureDprint, true); | ||
| for (Device* device : this->devices_) { | ||
| this->RunTestOnDevice( | ||
| [](DPrintFixture* fixture, Device* device) { CMAKE_UNIQUE_NAMESPACE::RunTest(fixture, device); }, device); | ||
| } | ||
| tt::llrt::RunTimeOptions::get_instance().set_feature_prepend_device_core_risc( | ||
| tt::llrt::RunTimeDebugFeatureDprint, false); | ||
| } | ||
|
|
||
| TEST_F(DPrintFixture, TensixActiveEthTestPrintPrependDeviceCoreRisc) { | ||
| tt::llrt::RunTimeOptions::get_instance().set_feature_prepend_device_core_risc( | ||
| tt::llrt::RunTimeDebugFeatureDprint, true); | ||
| for (Device* device : this->devices_) { | ||
| if (device->get_active_ethernet_cores(true).empty()) { | ||
| log_info(tt::LogTest, "Skipping device {} due to no active ethernet cores...", device->id()); | ||
| continue; | ||
| } | ||
| this->RunTestOnDevice( | ||
| [](DPrintFixture* fixture, Device* device) { CMAKE_UNIQUE_NAMESPACE::RunTest(fixture, device, true); }, | ||
| device); | ||
| } | ||
| tt::llrt::RunTimeOptions::get_instance().set_feature_prepend_device_core_risc( | ||
| tt::llrt::RunTimeDebugFeatureDprint, false); | ||
| } |
23 changes: 23 additions & 0 deletions
23
tests/tt_metal/tt_metal/test_kernels/misc/print_simple.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| // SPDX-FileCopyrightText: © 2024 Tenstorrent Inc. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| #include "debug/dprint.h" | ||
|
|
||
| #if defined(COMPILE_FOR_TRISC) | ||
| #include "compute_kernel_api/common.h" | ||
| namespace NAMESPACE { | ||
| void MAIN { | ||
| #else | ||
| void kernel_main() { | ||
| #endif | ||
| DPRINT << "Printing on a RISC." << ENDL(); | ||
| DPRINT_UNPACK(DPRINT << "Printing on TR0." << ENDL();); | ||
| DPRINT_MATH(DPRINT << "Printing on TR1." << ENDL();); | ||
| DPRINT_PACK(DPRINT << "Printing on TR2." << ENDL();); | ||
| DPRINT_DATA0(DPRINT << "Printing on BR." << ENDL();); | ||
| DPRINT_DATA1(DPRINT << "Printing on NC." << ENDL();); | ||
| } | ||
| #if defined(COMPILE_FOR_TRISC) | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters