From 0b0acfaa884d25f048b86b1c10e05f3c62ef24d4 Mon Sep 17 00:00:00 2001
From: Yihua Xu <yihua.xu@intel.com>
Date: Tue, 25 Dec 2018 20:21:13 +0800
Subject: [PATCH] Add mkldnn item for porfile and compare usage.

test=develop
---
 .../tests/api/analyzer_mm_dnn_tester.cc       | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/paddle/fluid/inference/tests/api/analyzer_mm_dnn_tester.cc b/paddle/fluid/inference/tests/api/analyzer_mm_dnn_tester.cc
index 8aaab6d6649..2a61a30c726 100644
--- a/paddle/fluid/inference/tests/api/analyzer_mm_dnn_tester.cc
+++ b/paddle/fluid/inference/tests/api/analyzer_mm_dnn_tester.cc
@@ -116,11 +116,15 @@ void SetInput(std::vector<std::vector<PaddleTensor>> *inputs) {
 }
 
 // Easy for profiling independently.
-TEST(Analyzer_MM_DNN, profile) {
+void profile(bool use_mkldnn = false) {
   contrib::AnalysisConfig cfg;
   SetConfig(&cfg);
   std::vector<PaddleTensor> outputs;
 
+  if (use_mkldnn) {
+    cfg.EnableMKLDNN();
+  }
+
   std::vector<std::vector<PaddleTensor>> input_slots_all;
   SetInput(&input_slots_all);
   TestPrediction(reinterpret_cast<const PaddlePredictor::Config *>(&cfg),
@@ -141,6 +145,11 @@ TEST(Analyzer_MM_DNN, profile) {
   }
 }
 
+TEST(Analyzer_MM_DNN, profile) { profile(); }
+#ifdef PADDLE_WITH_MKLDNN
+TEST(Analyzer_MM_DNN, profile_mkldnn) { profile(true /* use_mkldnn */); }
+#endif
+
 // Check the fuse status
 TEST(Analyzer_MM_DNN, fuse_statis) {
   contrib::AnalysisConfig cfg;
@@ -153,16 +162,25 @@ TEST(Analyzer_MM_DNN, fuse_statis) {
 }
 
 // Compare result of NativeConfig and AnalysisConfig
-TEST(Analyzer_MM_DNN, compare) {
+void compare(bool use_mkldnn = false) {
   contrib::AnalysisConfig cfg;
   SetConfig(&cfg);
 
+  if (use_mkldnn) {
+    cfg.EnableMKLDNN();
+  }
+
   std::vector<std::vector<PaddleTensor>> input_slots_all;
   SetInput(&input_slots_all);
   CompareNativeAndAnalysis(
       reinterpret_cast<const PaddlePredictor::Config *>(&cfg), input_slots_all);
 }
 
+TEST(Analyzer_MM_DNN, compare) { compare(); }
+#ifdef PADDLE_WITH_MKLDNN
+TEST(Analyzer_MM_DNN, compare_mkldnn) { compare(true /* use_mkldnn */); }
+#endif
+
 // Compare Deterministic result
 TEST(Analyzer_MM_DNN, compare_determine) {
   AnalysisConfig cfg;
-- 
GitLab