Fix Windows+CPU Plugin+CC compile fail issue.

Squash all commit to one.

Signed-off-by: Yan, Xiping <[email protected]>

Author: xipingyan

src/cpu/cpu_engine.hpp

@@ -37,7 +37,10 @@
     impl_list_item_t( \
             impl_list_item_t::type_deduction_helper_t<__VA_ARGS__::pd_t>())
 #define CPU_INSTANCE(...) DNNL_PRIMITIVE_IMPL(CPU_INSTANCE_IMPL, __VA_ARGS__)
-#define CPU_INSTANCE_X64(...) DNNL_X64_ONLY(CPU_INSTANCE(__VA_ARGS__))
+// Expanding DNNL_X64_ONLY in order to fix Conditional Compilation failure on Windows + CPU plugin.
+// DNNL_X64_ONLY == CONCAT2(Z_DO_IF_, DNNL_X64)
+#define CPU_INSTANCE_X64(...) \
+    CONCAT2(Z_DO_IF_, DNNL_X64)(CPU_INSTANCE(__VA_ARGS__))
 #define CPU_INSTANCE_SSE41(...) REG_SSE41_ISA(CPU_INSTANCE(__VA_ARGS__))
 #define CPU_INSTANCE_AVX2(...) REG_AVX2_ISA(CPU_INSTANCE(__VA_ARGS__))
 #define CPU_INSTANCE_AVX512(...) REG_AVX512_ISA(CPU_INSTANCE(__VA_ARGS__))