Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b6c7433

Browse files
wzt1997wzt1997
committedMar 18, 2025
benchdnn: graph: enbale data filling with default value
1 parent 8c811df commit b6c7433

7 files changed

+87
-41
lines changed
 

‎tests/benchdnn/graph/bench_graph.cpp

-12
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,6 @@ void check_correctness(const settings_t &s) {
5858
}
5959
}
6060

61-
int verify_input(const settings_t &s) {
62-
if (has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) {
63-
// TODO: update graph driver doc page once the limitation is removed.
64-
BENCHDNN_PRINT(0, "%s\n",
65-
"Error: graph driver doesn't support "
66-
"--mode-modifier=M/--mode=F.");
67-
return FAIL;
68-
}
69-
return OK;
70-
}
71-
7261
int bench(int argc, char **argv) {
7362
driver_name = "graph";
7463
using namespace parser;
@@ -88,7 +77,6 @@ int bench(int argc, char **argv) {
8877
if (!parsed_options) {
8978
if (!parse_input_file(s.json_file, argv[0]))
9079
catch_unknown_options(argv[0]);
91-
SAFE(verify_input(s), WARN);
9280
check_correctness(s);
9381
flush_temp_memory();
9482
}

‎tests/benchdnn/graph/custom_driver.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ void setup_cmp(compare::compare_t &cmp, const prb_t *prb, data_kind_t kind,
293293

294294
int fill_mem(dnn_mem_t &mem_dt, dnn_mem_t &mem_fp, int f_min, int f_max) {
295295

296+
if (has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) return OK;
296297
const auto nelems = mem_fp.nelems();
297298
if (nelems == 0) return OK;
298299

@@ -339,8 +340,6 @@ void init_memory_args(dnn_mem_map_t &mem_map, const prb_t *prb,
339340

340341
int init_ref_memory_args(dnn_mem_map_t &ref_mem_map, dnn_mem_map_t &mem_map,
341342
const prb_t *prb, res_t *res) {
342-
if (has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) return OK;
343-
344343
switch (prb->alg) {
345344
case GENINDEX:
346345
SAFE(::custom::genindex::init_ref_memory_args(

‎tests/benchdnn/graph/graph.cpp

+34-17
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ int make_input_tensors(std::vector<dnnl::graph::tensor> &input_ts,
253253
}
254254

255255
// generate tensor for graph path
256-
257256
const auto iter = partition_mem_map.find(lt_id);
258257
if (iter != partition_mem_map.end()) {
259258
const auto &graph_mem = iter->second;
@@ -663,10 +662,16 @@ int doit(const prb_t *prb, res_t *res) {
663662
std::vector<dnnl::graph::tensor> output_ts(outputs.size());
664663

665664
ref_partition_t ref_partition(dg, partitions[i], inputs, outputs);
666-
// Construct memory for both perf & corr modes
667-
SAFE(ref_partition.init_ref(
668-
graph_in_ports, partition_mem_map_v[i], res),
669-
WARN);
665+
666+
if (!has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) {
667+
// Construct memory for both perf & corr modes
668+
SAFE(ref_partition.init_ref(
669+
graph_in_ports, partition_mem_map_v[i], res),
670+
WARN);
671+
if (res->state == SKIPPED) return OK;
672+
}
673+
674+
SAFE(ref_partition.init_graph_mem(partition_mem_map_v[i], res), WARN);
670675
if (res->state == SKIPPED) return OK;
671676

672677
if (has_bench_mode_bit(mode_bit_t::corr)) {
@@ -682,15 +687,18 @@ int doit(const prb_t *prb, res_t *res) {
682687
}
683688
}
684689

685-
// unmap memory from host to device
686-
map_unmap_partition_mem(partition_mem_map_v[i], inputs, UNMAP, res);
687-
map_unmap_partition_mem(partition_mem_map_v[i], outputs, UNMAP, res);
688-
if (res->state == FAIL) {
689-
BENCHDNN_PRINT(0,
690-
"FAIL: Fail to unmap memories to host for partition "
691-
"%zu.\n",
692-
i);
693-
return FAIL;
690+
if (!has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) {
691+
// unmap memory from host to device
692+
map_unmap_partition_mem(partition_mem_map_v[i], inputs, UNMAP, res);
693+
map_unmap_partition_mem(
694+
partition_mem_map_v[i], outputs, UNMAP, res);
695+
if (res->state == FAIL) {
696+
BENCHDNN_PRINT(0,
697+
"FAIL: Fail to unmap memories to host for partition "
698+
"%zu.\n",
699+
i);
700+
return FAIL;
701+
}
694702
}
695703

696704
const op_ref_list_t &op_list = ref_partition.get_partition_ops();
@@ -730,9 +738,18 @@ int doit(const prb_t *prb, res_t *res) {
730738
DNN_GRAPH_SAFE(strm.wait(), WARN, res);
731739
graph_mem_mgr.stop_graph_mem_check();
732740

733-
// map memory from device back to host
734-
map_unmap_partition_mem(partition_mem_map_v[i], inputs, MAP, res);
735-
map_unmap_partition_mem(partition_mem_map_v[i], outputs, MAP, res);
741+
if (!has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) {
742+
// map memory from device back to host
743+
map_unmap_partition_mem(partition_mem_map_v[i], inputs, MAP, res);
744+
map_unmap_partition_mem(partition_mem_map_v[i], outputs, MAP, res);
745+
if (res->state == FAIL) {
746+
BENCHDNN_PRINT(0,
747+
"FAIL: Fail to map memories back to host for partition "
748+
"%zu.\n",
749+
i);
750+
return FAIL;
751+
}
752+
}
736753

737754
// If the device is out-of-memory due to graph path execution, skip the
738755
// case.

‎tests/benchdnn/graph/graph_memory.cpp

+23-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,29 @@ size_t get_benchdnn_device_limit() {
4242
return benchdnn_device_limit;
4343
}
4444

45+
dnn_graph_mem_t::dnn_graph_mem_t(
46+
const deserialized_lt &lt, const bool is_op_input)
47+
: graph_dims_(lt.shape_), graph_strides_(lt.stride_) {
48+
49+
const auto &graph_dt = convert_dt(lt.get_data_type());
50+
const auto data_type = static_cast<dnnl::memory::data_type>(graph_dt);
51+
52+
const auto &g_eng = get_graph_engine().operator const dnnl::engine &();
53+
54+
if (is_op_input) {
55+
56+
if (graph_dims_.empty()) graph_dims_.push_back(1);
57+
if (graph_strides_.empty()) graph_strides_.push_back(1);
58+
59+
// create graph memory
60+
dnnl::memory::desc md(graph_dims_, data_type, graph_strides_);
61+
mem_ = dnn_mem_t(md.get(), g_eng.get());
62+
} else {
63+
dnnl::memory::desc md(graph_dims_, data_type, graph_strides_);
64+
mem_ = dnn_mem_t(md.get(), g_eng.get());
65+
}
66+
}
67+
4568
// Constructs memories for all inputs and outputs needed for comparison.
4669
dnn_graph_mem_t::dnn_graph_mem_t(const dnn_mem_t &mem,
4770
const deserialized_lt &lt, const bool is_op_input,
@@ -93,7 +116,6 @@ dnn_graph_mem_t::dnn_graph_mem_t(const dnn_mem_t &mem,
93116
SAFE_V(c_mem.reorder(mem));
94117
prim_to_graph_memcpy(mem_, c_mem);
95118
} else {
96-
// ... otherwise, perform a plain memcpy.
97119
prim_to_graph_memcpy(mem_, mem);
98120
}
99121
} else {

‎tests/benchdnn/graph/graph_memory.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@ struct dnn_graph_mem_t {
163163
dnn_graph_mem_t(const dnn_mem_t &mem, const deserialized_lt &lt,
164164
const bool is_op_input, const bool is_fake_output = false);
165165

166+
dnn_graph_mem_t(const deserialized_lt &lt, const bool is_op_input);
167+
166168
dnnl::graph::tensor make_graph_tensor(const deserialized_lt &lt) const;
167169

168170
const dnn_mem_t &get_mem() const { return mem_; }

‎tests/benchdnn/graph/ref_partition.cpp

+24-9
Original file line numberDiff line numberDiff line change
@@ -150,30 +150,45 @@ int ref_partition_t::init_ref(const std::vector<size_t> &graph_in_ports,
150150
SAFE_V(data_displacer.displace_input_data(
151151
entry.first, const_cast<dnn_mem_t &>(entry.second), res));
152152
}
153+
return OK;
154+
}
155+
156+
int ref_partition_t::init_graph_mem(
157+
partition_mem_map_t &partition_mem_map, res_t *res) {
153158

154159
// init graph input/oputput memory from lt_id_2_mems_
155160
for (const auto &id : partition_in_ids_) {
156-
if (lt_id_2_mems_.find(id) == lt_id_2_mems_.end()) {
161+
162+
if (lt_id_2_mems_.find(id) != lt_id_2_mems_.end()) {
163+
partition_mem_map.emplace(id,
164+
dnn_graph_mem_t(
165+
lt_id_2_mems_.at(id), lt_id_2_lt_.at(id), true));
166+
} else if (has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) {
167+
partition_mem_map.emplace(
168+
id, dnn_graph_mem_t(lt_id_2_lt_.at(id), true));
169+
} else {
157170
BENCHDNN_PRINT(0, "Fail: cannot find memory for %zu\n", id);
158171
res->state = FAILED;
159172
return FAIL;
160173
}
161-
partition_mem_map.emplace(id,
162-
dnn_graph_mem_t(
163-
lt_id_2_mems_.at(id), lt_id_2_lt_.at(id), true));
164174
}
165175
for (const auto &id : partition_out_ids_) {
176+
166177
if (fake_lt_ids_.find(id) != fake_lt_ids_.end()) {
167178
partition_mem_map.emplace(
168179
id, dnn_graph_mem_t({}, lt_id_2_lt_.at(id), false, true));
169-
} else if (lt_id_2_mems_.find(id) == lt_id_2_mems_.end()) {
170-
BENCHDNN_PRINT(0, "Fail: cannot find memory for %zu\n", id);
171-
res->state = FAILED;
172-
return FAIL;
173-
} else
180+
} else if (lt_id_2_mems_.find(id) != lt_id_2_mems_.end()) {
174181
partition_mem_map.emplace(id,
175182
dnn_graph_mem_t(
176183
lt_id_2_mems_.at(id), lt_id_2_lt_.at(id), false));
184+
} else if (has_bench_mode_modifier(mode_modifier_t::no_ref_memory)) {
185+
partition_mem_map.emplace(
186+
id, dnn_graph_mem_t(lt_id_2_lt_.at(id), true));
187+
} else {
188+
BENCHDNN_PRINT(0, "Fail: cannot find memory for %zu\n", id);
189+
res->state = FAILED;
190+
return FAIL;
191+
}
177192
}
178193

179194
return OK;

‎tests/benchdnn/graph/ref_partition.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ class ref_partition_t {
4242
// prepare memories in both paths, one by one ref primitive
4343
int init_ref(const std::vector<size_t> &graph_ports,
4444
partition_mem_map_t &partition_mem_map, res_t *res);
45+
46+
int init_graph_mem(partition_mem_map_t &partition_mem_map, res_t *res);
47+
4548
// run partition in ref path, one by one ref primitive
4649
void exec_ops(res_t *res);
4750

0 commit comments

Comments
 (0)
Please sign in to comment.