Skip to content

Commit

Permalink
#0: another way of modify the test
Browse files Browse the repository at this point in the history
  • Loading branch information
@miawangTT
miawangTT committed Nov 26, 2024
1 parent 104aaf2 commit 2f17906
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 56 deletions.
10 changes: 4 additions & 6 deletions tests/scripts/run_tunneler_tests.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,10 @@ main() {
done

if [[ $ARCH_NAME == "wormhole_b0" && $machine_type != "N150" ]]; then
for i in $(seq 1 3); do # run 3 times to mitigate the chance of ethernet timeout
for max_packet_size_words in 256 512 1024 2048; do
run_test "./build/test/tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel --tx_x 4 --tx_y 7 --mux_x 0 --mux_y 7 --demux_x 0 --demux_y 0 --rx_x 0 --rx_y 1 --max_packet_size_words $max_packet_size_words --tx_skip_pkt_content_gen 1 --rx_disable_data_check 1 --rx_disable_header_check 1 --tx_pkt_dest_size_choice 1 --check_txrx_timeout 1 --data_kb_per_tx 1048576 --tunneler_queue_size_bytes 32768 --tx_queue_size_bytes 65536 --rx_queue_size_bytes 131072 --mux_queue_size_bytes 65536 --demux_queue_size_bytes 65536"
run_test "./build/test/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_2ep --tx_x 4 --tx_y 7 --mux_x 0 --mux_y 7 --demux_x 0 --demux_y 0 --rx_x 0 --rx_y 1 --max_packet_size_words $max_packet_size_words --tx_skip_pkt_content_gen 1 --rx_disable_data_check 1 --rx_disable_header_check 1 --tx_pkt_dest_size_choice 1 --check_txrx_timeout 1 --data_kb_per_tx 1048576 --tunneler_queue_size_bytes 32768 --tx_queue_size_bytes 65536 --rx_queue_size_bytes 131072 --mux_queue_size_bytes 65536 --demux_queue_size_bytes 65536"
run_test "./build/test/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_4ep --tx_x 4 --tx_y 7 --mux_x 0 --mux_y 7 --demux_x 0 --demux_y 0 --rx_x 0 --rx_y 1 --max_packet_size_words $max_packet_size_words --tx_skip_pkt_content_gen 1 --rx_disable_data_check 1 --rx_disable_header_check 1 --tx_pkt_dest_size_choice 1 --check_txrx_timeout 1 --data_kb_per_tx 1048576 --tunneler_queue_size_bytes 16384 --tx_queue_size_bytes 65536 --rx_queue_size_bytes 131072 --mux_queue_size_bytes 65536 --demux_queue_size_bytes 65536"
done
for max_packet_size_words in 256 512 1024 2048; do
run_test "./build/test/tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel --tx_x 4 --tx_y 7 --mux_x 0 --mux_y 7 --demux_x 0 --demux_y 0 --rx_x 0 --rx_y 1 --max_packet_size_words $max_packet_size_words --tx_skip_pkt_content_gen 1 --rx_disable_data_check 1 --rx_disable_header_check 1 --tx_pkt_dest_size_choice 1 --check_txrx_timeout 1 --data_kb_per_tx 1048576 --tunneler_queue_size_bytes 32768 --tx_queue_size_bytes 65536 --rx_queue_size_bytes 131072 --mux_queue_size_bytes 65536 --demux_queue_size_bytes 65536"
run_test "./build/test/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_2ep --tx_x 4 --tx_y 7 --mux_x 0 --mux_y 7 --demux_x 0 --demux_y 0 --rx_x 0 --rx_y 1 --max_packet_size_words $max_packet_size_words --tx_skip_pkt_content_gen 1 --rx_disable_data_check 1 --rx_disable_header_check 1 --tx_pkt_dest_size_choice 1 --check_txrx_timeout 1 --data_kb_per_tx 1048576 --tunneler_queue_size_bytes 32768 --tx_queue_size_bytes 65536 --rx_queue_size_bytes 131072 --mux_queue_size_bytes 65536 --demux_queue_size_bytes 65536"
run_test "./build/test/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_4ep --tx_x 4 --tx_y 7 --mux_x 0 --mux_y 7 --demux_x 0 --demux_y 0 --rx_x 0 --rx_y 1 --max_packet_size_words $max_packet_size_words --tx_skip_pkt_content_gen 1 --rx_disable_data_check 1 --rx_disable_header_check 1 --tx_pkt_dest_size_choice 1 --check_txrx_timeout 1 --data_kb_per_tx 1048576 --tunneler_queue_size_bytes 16384 --tx_queue_size_bytes 65536 --rx_queue_size_bytes 131072 --mux_queue_size_bytes 65536 --demux_queue_size_bytes 65536"
done
fi

Expand Down
24 changes: 6 additions & 18 deletions tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_2ep.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ int main(int argc, char **argv) {
assert((pkt_dest_size_choices_t)tx_pkt_dest_size_choice == pkt_dest_size_choices_t::SAME_START_RNDROBIN_FIX_SIZE && rx_disable_header_check || (pkt_dest_size_choices_t)tx_pkt_dest_size_choice == pkt_dest_size_choices_t::RANDOM);

bool pass = true;
bool is_eth_timeout = false;

std::map<string, string> defines = {
{"FD_CORE_TYPE", std::to_string(0)}, // todo, support dispatch on eth
Expand Down Expand Up @@ -563,7 +562,7 @@ int main(int argc, char **argv) {

tunneler_test_results_addr, // 44: test_results_addr
tunneler_test_results_size, // 45: test_results_size
timeout_mcycles * 1000 * 1000 * 4, // 46: timeout_cycles
0, // 46: timeout_cycles
0, //47: inner_stop_mux_d_bypass
};

Expand Down Expand Up @@ -645,7 +644,7 @@ int main(int argc, char **argv) {

tunneler_test_results_addr, // 44: test_results_addr
tunneler_test_results_size, // 45: test_results_size
timeout_mcycles * 1000 * 1000 * 4, // 46: timeout_cycles
0, // 46: timeout_cycles
0, //47: inner_stop_mux_d_bypass
};

Expand Down Expand Up @@ -805,14 +804,6 @@ int main(int argc, char **argv) {
std::chrono::duration<double> elapsed_seconds = (end-start);
log_info(LogTest, "Ran in {:.2f}us", elapsed_seconds.count() * 1000 * 1000);

vector<uint32_t> tunnuler_results = tt::llrt::read_hex_vec_from_core(
device->id(), tunneler_phys_core, tunneler_test_results_addr, tunneler_test_results_size);
is_eth_timeout |= ((tunnuler_results[PQ_TEST_STATUS_INDEX] == PACKET_QUEUE_TEST_TIMEOUT));

vector<uint32_t> r_tunnuler_results = tt::llrt::read_hex_vec_from_core(
device->id(), r_tunneler_phys_core, tunneler_test_results_addr, tunneler_test_results_size);
is_eth_timeout |= ((r_tunnuler_results[PQ_TEST_STATUS_INDEX] == PACKET_QUEUE_TEST_TIMEOUT));

vector<vector<uint32_t>> tx_results;
vector<vector<uint32_t>> tx_results_r;
vector<vector<uint32_t>> rx_results;
Expand Down Expand Up @@ -1143,13 +1134,13 @@ int main(int argc, char **argv) {
&& (demux_queue_size_bytes >= 0x10000)) {
double target_bandwidth = 0;
if (max_packet_size_words >= 2048) {
target_bandwidth = 4.8;
target_bandwidth = 4.5;
log_info(LogTest, "Perf check for pkt size >= 2048 words");
} else if (max_packet_size_words >= 1024) {
target_bandwidth = 5;
target_bandwidth = 4.7;
log_info(LogTest, "Perf check for pkt size >= 1024 words");
} else if (max_packet_size_words >= 512) {
target_bandwidth = 2.7;
target_bandwidth = 2.4;
log_info(LogTest, "Perf check for pkt size >= 512 words");
}else if (max_packet_size_words >= 256) {
target_bandwidth = 1;
Expand All @@ -1176,10 +1167,7 @@ int main(int argc, char **argv) {

tt::llrt::OptionsG.set_kernels_nullified(false);

if (is_eth_timeout) {
log_info(LogTest, "Test timeout because tunneler is not set up in time (e.g., the other core is not programmed in time)");
return 0;
} else if (pass) {
if (pass) {
log_info(LogTest, "Test Passed");
return 0;
} else {
Expand Down
20 changes: 4 additions & 16 deletions tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_bi_tunnel_4ep.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ int main(int argc, char **argv) {
assert((pkt_dest_size_choices_t)tx_pkt_dest_size_choice == pkt_dest_size_choices_t::SAME_START_RNDROBIN_FIX_SIZE && rx_disable_header_check || (pkt_dest_size_choices_t)tx_pkt_dest_size_choice == pkt_dest_size_choices_t::RANDOM);

bool pass = true;
bool is_eth_timeout = false;

std::map<string, string> defines = {
{"FD_CORE_TYPE", std::to_string(0)}, // todo, support dispatch on eth
Expand Down Expand Up @@ -621,7 +620,7 @@ int main(int argc, char **argv) {

tunneler_test_results_addr, // 44: test_results_addr
tunneler_test_results_size, // 45: test_results_size
timeout_mcycles * 1000 * 1000 * 4, // 46: timeout_cycles
0, // 46: timeout_cycles
0, //47: inner_stop_mux_d_bypass
};

Expand Down Expand Up @@ -735,7 +734,7 @@ int main(int argc, char **argv) {

tunneler_test_results_addr, // 44: test_results_addr
tunneler_test_results_size, // 45: test_results_size
timeout_mcycles * 1000 * 1000 * 4, // 46: timeout_cycles
0, // 46: timeout_cycles
0, //47: inner_stop_mux_d_bypass
};

Expand Down Expand Up @@ -919,14 +918,6 @@ int main(int argc, char **argv) {
std::chrono::duration<double> elapsed_seconds = (end-start);
log_info(LogTest, "Ran in {:.2f}us", elapsed_seconds.count() * 1000 * 1000);

vector<uint32_t> tunnuler_results = tt::llrt::read_hex_vec_from_core(
device->id(), tunneler_phys_core, tunneler_test_results_addr, tunneler_test_results_size);
is_eth_timeout |= ((tunnuler_results[PQ_TEST_STATUS_INDEX] == PACKET_QUEUE_TEST_TIMEOUT));

vector<uint32_t> r_tunnuler_results = tt::llrt::read_hex_vec_from_core(
device->id(), r_tunneler_phys_core, tunneler_test_results_addr, tunneler_test_results_size);
is_eth_timeout |= ((r_tunnuler_results[PQ_TEST_STATUS_INDEX] == PACKET_QUEUE_TEST_TIMEOUT));

vector<vector<uint32_t>> tx_results;
vector<vector<uint32_t>> tx_results_r;
vector<vector<uint32_t>> rx_results;
Expand Down Expand Up @@ -1260,7 +1251,7 @@ int main(int argc, char **argv) {
target_bandwidth = 3.8;
log_info(LogTest, "Perf check for pkt size >= 2048 words");
} else if (max_packet_size_words >= 1024) {
target_bandwidth = 4.3;
target_bandwidth = 4.2;
log_info(LogTest, "Perf check for pkt size >= 1024 words");
} else if (max_packet_size_words >= 512) {
target_bandwidth = 2;
Expand Down Expand Up @@ -1290,10 +1281,7 @@ int main(int argc, char **argv) {

tt::llrt::OptionsG.set_kernels_nullified(false);

if (is_eth_timeout) {
log_info(LogTest, "Test timeout because tunneler is not set up in time (e.g., the other core is not programmed in time)");
return 0;
} else if (pass) {
if (pass) {
log_info(LogTest, "Test Passed");
return 0;
} else {
Expand Down
20 changes: 4 additions & 16 deletions tests/tt_metal/tt_metal/perf_microbenchmark/routing/test_vc_uni_tunnel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ int main(int argc, char **argv) {
uint32_t test_device_id = test_args::get_command_option_uint32(input_args, "--device_id", default_test_device_id);

bool pass = true;
bool is_eth_timeout = false;

std::map<string, string> defines = {
{"FD_CORE_TYPE", std::to_string(0)}, // todo, support dispatch on eth
Expand Down Expand Up @@ -418,7 +417,7 @@ int main(int argc, char **argv) {
0, 0, 0, 0, 0, 0, // 38 - 43: remote_sender 4 - 9
tunneler_test_results_addr, // 44: test_results_addr
tunneler_test_results_size, // 45: test_results_size
timeout_mcycles * 1000 * 1000 * 4, // 46: timeout_cycles
0, // 46: timeout_cycles
0, //47: inner_stop_mux_d_bypass
};

Expand Down Expand Up @@ -488,7 +487,7 @@ int main(int argc, char **argv) {
0, 0, 0, 0, 0, 0, // 38 - 43: remote_sender 4 - 9
tunneler_test_results_addr, // 44: test_results_addr
tunneler_test_results_size, // 45: test_results_size
timeout_mcycles * 1000 * 1000 * 4, // 46: timeout_cycles
0, // 46: timeout_cycles
0, //47: inner_stop_mux_d_bypass
};

Expand Down Expand Up @@ -590,14 +589,6 @@ int main(int argc, char **argv) {
std::chrono::duration<double> elapsed_seconds = (end-start);
log_info(LogTest, "Ran in {:.2f}us", elapsed_seconds.count() * 1000 * 1000);

vector<uint32_t> tunnuler_results = tt::llrt::read_hex_vec_from_core(
device->id(), tunneler_phys_core, tunneler_test_results_addr, tunneler_test_results_size);
is_eth_timeout |= ((tunnuler_results[PQ_TEST_STATUS_INDEX] == PACKET_QUEUE_TEST_TIMEOUT));

vector<uint32_t> r_tunnuler_results = tt::llrt::read_hex_vec_from_core(
device->id(), r_tunneler_phys_core, tunneler_test_results_addr, tunneler_test_results_size);
is_eth_timeout |= ((r_tunnuler_results[PQ_TEST_STATUS_INDEX] == PACKET_QUEUE_TEST_TIMEOUT));

vector<vector<uint32_t>> tx_results;
vector<vector<uint32_t>> rx_results;
for (uint32_t i = 0; i < num_src_endpoints; i++) {
Expand Down Expand Up @@ -798,7 +789,7 @@ int main(int argc, char **argv) {
target_bandwidth = 7;
log_info(LogTest, "Perf check for pkt size >= 2048 words");
} else if (max_packet_size_words >= 1024) {
target_bandwidth = 10.3;
target_bandwidth = 9.0;
log_info(LogTest, "Perf check for pkt size >= 1024 words");
} else if (max_packet_size_words >= 256) {
target_bandwidth = 2.5;
Expand All @@ -825,10 +816,7 @@ int main(int argc, char **argv) {

tt::llrt::OptionsG.set_kernels_nullified(false);

if (is_eth_timeout) {
log_info(LogTest, "Test timeout because tunneler is not set up in time (e.g., the other core is not programmed in time)");
return 0;
} else if (pass) {
if (pass) {
log_info(LogTest, "Test Passed");
return 0;
} else {
Expand Down

0 comments on commit 2f17906

Please sign in to comment.