From 526bc879aae8e067b365332c7e0b8202c5fa5f54 Mon Sep 17 00:00:00 2001 From: "Bao, Yixin" Date: Wed, 15 Jan 2025 22:51:08 -0800 Subject: [PATCH] gtests: graph: update pass name in ut --- .../unit/backend/dnnl/test_large_partition.cpp | 18 +++++++++++++----- .../graph/unit/backend/dnnl/test_pass.cpp | 4 +++- .../unit/backend/dnnl/test_sdp_decomp.cpp | 14 +++++++------- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/tests/gtests/graph/unit/backend/dnnl/test_large_partition.cpp b/tests/gtests/graph/unit/backend/dnnl/test_large_partition.cpp index 3348d655b5f..bb91b2ba2fc 100644 --- a/tests/gtests/graph/unit/backend/dnnl/test_large_partition.cpp +++ b/tests/gtests/graph/unit/backend/dnnl/test_large_partition.cpp @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright 2020-2024 Intel Corporation +* Copyright 2020-2025 Intel Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -660,7 +660,9 @@ TEST(test_large_partition_execute, F32Mha) { ASSERT_EQ(g.get_ops().size(), 7U); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass( + eng->kind() == graph::engine_kind::cpu ? "float_sdp_fusion_cpu" + : "float_sdp_fusion_gpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -717,7 +719,9 @@ TEST(test_large_partition_execute, F32DistilBertMha) { ASSERT_EQ(g.get_ops().size(), 7U); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass( + eng->kind() == graph::engine_kind::cpu ? "float_sdp_fusion_cpu" + : "float_sdp_fusion_gpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -989,7 +993,9 @@ TEST(test_large_partition_execute, Bf16Mha_CPU) { ASSERT_EQ(g.get_ops().size(), 7U); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass( + eng->kind() == graph::engine_kind::cpu ? "float_sdp_fusion_cpu" + : "float_sdp_fusion_gpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -1134,7 +1140,9 @@ TEST(test_large_partition_execute, Bf16DistilBertMha) { ASSERT_EQ(g.get_ops().size(), 7U); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass( + eng->kind() == graph::engine_kind::cpu ? "float_sdp_fusion_cpu" + : "float_sdp_fusion_gpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; diff --git a/tests/gtests/graph/unit/backend/dnnl/test_pass.cpp b/tests/gtests/graph/unit/backend/dnnl/test_pass.cpp index 2179de19e0e..260b9318cb4 100644 --- a/tests/gtests/graph/unit/backend/dnnl/test_pass.cpp +++ b/tests/gtests/graph/unit/backend/dnnl/test_pass.cpp @@ -12929,7 +12929,9 @@ TEST(test_pass, F32MhaFusion) { agraph.finalize(); ASSERT_EQ(agraph.get_ops().size(), 7U); - dnnl::impl::graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass( + engine_kind == graph::engine_kind::cpu ? "float_sdp_fusion_cpu" + : "float_sdp_fusion_gpu"); apass->run(agraph); ASSERT_EQ(agraph.get_num_partitions(), 1U); } diff --git a/tests/gtests/graph/unit/backend/dnnl/test_sdp_decomp.cpp b/tests/gtests/graph/unit/backend/dnnl/test_sdp_decomp.cpp index 5430a0276e9..87b50411289 100644 --- a/tests/gtests/graph/unit/backend/dnnl/test_sdp_decomp.cpp +++ b/tests/gtests/graph/unit/backend/dnnl/test_sdp_decomp.cpp @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright 2024 Intel Corporation +* Copyright 2024-2025 Intel Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ TEST(test_sdp_decomp_execute, F32SdpDecomp_CPU) { else ASSERT_EQ(g.get_ops().size(), 6U); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion_cpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -179,7 +179,7 @@ TEST(test_sdp_decomp_execute, Bf16SdpDecomp_CPU) { else ASSERT_EQ(g.get_ops().size(), 6U); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion_cpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -570,7 +570,7 @@ TEST(test_sdp_decomp_execute, F32SdpCorr_CPU) { attention_mask_vec[j]); g.finalize(); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion_cpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -688,7 +688,7 @@ TEST(test_sdp_decomp_execute, F32DistilBertSdpCorr_CPU) { batch_size, seq_len, num_head, head_dim, transpose_b[i]); g.finalize(); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion_cpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -811,7 +811,7 @@ TEST(test_sdp_decomp_execute, Bf16SdpCorr_CPU) { attention_mask_vec[j]); g.finalize(); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion_cpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0]; @@ -934,7 +934,7 @@ TEST(test_sdp_decomp_execute, Bf16DistilBertSdpCorr_CPU) { batch_size, seq_len, num_head, head_dim, transpose_b[i]); g.finalize(); - graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion"); + graph::pass::pass_base_ptr apass = get_pass("float_sdp_fusion_cpu"); apass->run(g); ASSERT_EQ(g.get_num_partitions(), 1U); auto part = g.get_partitions()[0];