PaddlePaddle
diff --git a/‎.gitignore
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎.gitignore
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎paddle/fluid/framework/new_executor/CMakeLists.txt
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions b/‎paddle/fluid/framework/new_executor/CMakeLists.txt
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
diff --git a/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_legacy_kernel_instruction.cc
Copy file name to clipboard
+52Lines changed: 52 additions & 0 deletions b/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_legacy_kernel_instruction.cc
Copy file name to clipboard
+52Lines changed: 52 additions & 0 deletions
diff --git a/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_legacy_kernel_instruction.h
Copy file name to clipboard
+72Lines changed: 72 additions & 0 deletions b/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_legacy_kernel_instruction.h
Copy file name to clipboard
+72Lines changed: 72 additions & 0 deletions
diff --git a/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_mixed_phi_kernel_instruction.cc
Copy file name to clipboard
+61Lines changed: 61 additions & 0 deletions b/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_mixed_phi_kernel_instruction.cc
Copy file name to clipboard
+61Lines changed: 61 additions & 0 deletions
diff --git a/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_mixed_phi_kernel_instruction.h
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions b/‎paddle/fluid/framework/new_executor/instruction/onednn/onednn_mixed_phi_kernel_instruction.h
Copy file name to clipboard
+42Lines changed: 42 additions & 0 deletions
@@ -108,6 +108,8 @@ paddle/fluid/pir/dialect/operator/ir/pd_api.*
 paddle/fluid/pir/dialect/operator/ir/op_decomp.cc
 paddle/fluid/pir/dialect/operator/ir/pd_op_vjp.cc
 paddle/fluid/pir/dialect/operator/ir/pd_op.*
+paddle/fluid/pir/dialect/operator/ir/pd_onednn_op.*
+paddle/fluid/pir/dialect/operator/ir/pd_onednn_op_info.*
 paddle/fluid/pir/dialect/operator/ir/pd_op_bwd.*
 paddle/fluid/pir/dialect/operator/ir/pd_op_fused.*
 paddle/fluid/pir/dialect/operator/ir/pd_op_fused_bwd.*
 
@@ -5,6 +5,16 @@ if(NOT (WITH_CINN AND NOT CINN_ONLY))
        ${CMAKE_CURRENT_SOURCE_DIR}/instruction/cinn_jit_instruction.cc)
 endif()
 
+if(NOT WITH_MKLDNN)
+  list(
+    REMOVE_ITEM
+    standalone_executor_srcs
+    ${CMAKE_CURRENT_SOURCE_DIR}/instruction/onednn/onednn_legacy_kernel_instruction.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/instruction/onednn/onednn_phi_kernel_instruction.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/instruction/onednn/onednn_mixed_phi_kernel_instruction.cc
+  )
+endif()
+
 set(standalone_executor_deps
     pir
     program_translator
 
@@ -0,0 +1,52 @@
+// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "paddle/fluid/framework/new_executor/instruction/onednn/onednn_legacy_kernel_instruction.h"
+
+#include "paddle/fluid/framework/new_executor/instruction/instruction_util.h"
+#include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
+#include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
+#include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/pir/dialect/operator/interface/infermeta.h"
+#include "paddle/fluid/pir/dialect/operator/interface/op_yaml_info.h"
+#include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
+#include "paddle/fluid/pir/dialect/operator/utils/op_yaml_info_parser.h"
+
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/phi/core/infermeta_utils.h"
+#include "paddle/phi/core/meta_tensor.h"
+#include "paddle/phi/core/type_defs.h"
+
+namespace paddle {
+namespace framework {
+
+OneDNNLegacyKernelInstruction::OneDNNLegacyKernelInstruction(
+    size_t id,
+    const platform::Place& place,
+    pir::Operation* op,
+    const ValueExecutionInfo* value_exec_info)
+    : InstructionBase(id, place), value_exec_info_(value_exec_info) {
+  PADDLE_THROW(platform::errors::Unimplemented(
+      "OneDNNLegacyKernelInstruction not defined now."));
+}
+
+OneDNNLegacyKernelInstruction::~OneDNNLegacyKernelInstruction() {}
+
+void OneDNNLegacyKernelInstruction::Run() {
+  PADDLE_THROW(platform::errors::Unimplemented(
+      "OneDNNLegacyKernelInstruction not defined now."));
+}
+}  // namespace framework
+}  // namespace paddle
@@ -0,0 +1,72 @@
+// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "paddle/fluid/framework/new_executor/instruction/instruction_base.h"
+
+namespace pir {
+class Operation;
+}  // namespace pir
+
+namespace paddle {
+namespace framework {
+class Scope;
+class ValueExecutionInfo;
+
+class OneDNNLegacyKernelInstruction : public InstructionBase {
+ public:
+  OneDNNLegacyKernelInstruction(size_t id,
+                                const platform::Place& place,
+                                ::pir::Operation* op,
+                                const ValueExecutionInfo* value_exec_info);
+
+  ~OneDNNLegacyKernelInstruction();
+  phi::Kernel* PhiKernel() const { return phi_kernel_; }
+
+  const phi::InferMetaContext& InferMetaContext() const {
+    return infer_meta_context_;
+  }
+
+  paddle::dialect::InferMetaInterface::Concept* InferMetaInterface() const {
+    return infer_meta_interface_;
+  }
+
+  void Run() override;
+
+  const std::string& Name() const override { return legacy_op_name_; }
+
+  ::pir::Operation* Operation() const override { return op_; }
+
+ private:
+  std::string legacy_op_name_;
+
+  paddle::dialect::InferMetaInterface::Concept* infer_meta_interface_{
+      nullptr};  // not owned
+
+  phi::InferMetaContext infer_meta_context_;
+
+  paddle::framework::ExecutionContext* kernel_context_{nullptr};
+  std::shared_ptr<framework::RuntimeContext> runtime_context_;
+  std::shared_ptr<paddle::framework::OperatorBase> operator_base_;
+
+  phi::Kernel* phi_kernel_{nullptr};  // not owned
+
+  ::pir::Operation* op_{nullptr};  // not owned
+
+  const ValueExecutionInfo* value_exec_info_;  // not owned
+};
+
+}  // namespace framework
+}  // namespace paddle
@@ -0,0 +1,61 @@
+// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "paddle/fluid/framework/new_executor/instruction/onednn/onednn_mixed_phi_kernel_instruction.h"
+
+#include "paddle/fluid/framework/new_executor/interpreter/interpreter_util.h"
+#include "paddle/fluid/framework/new_executor/interpreter/stream_analyzer.h"
+#include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
+#include "paddle/fluid/framework/scope.h"
+#include "paddle/fluid/pir/dialect/operator/interface/infermeta.h"
+#include "paddle/fluid/pir/dialect/operator/interface/op_yaml_info.h"
+#include "paddle/fluid/pir/dialect/operator/ir/op_dialect.h"
+#include "paddle/fluid/pir/dialect/operator/utils/op_yaml_info_parser.h"
+#include "paddle/fluid/platform/collective_helper.h"
+#include "paddle/fluid/platform/device_context.h"
+#include "paddle/phi/core/infermeta_utils.h"
+#include "paddle/phi/core/meta_tensor.h"
+#include "paddle/phi/core/type_defs.h"
+
+#include "paddle/pir/core/builtin_attribute.h"
+#include "paddle/pir/core/operation.h"
+#include "paddle/pir/core/value.h"
+
+#include "dnnl.hpp"  // NOLINT
+#include "paddle/fluid/framework/new_executor/instruction/instruction_util.h"
+#include "paddle/fluid/framework/type_defs.h"
+#include "paddle/fluid/ir_adaptor/translator/op_compat_info.h"
+#include "paddle/phi/backends/onednn/onednn_context.h"
+#include "paddle/phi/backends/onednn/onednn_helper.h"
+#include "paddle/phi/kernels/funcs/data_layout_transform.h"
+
+namespace paddle {
+namespace framework {
+
+OneDNNMixedPhiKernelInstruction::OneDNNMixedPhiKernelInstruction(
+    size_t id,
+    const platform::Place& place,
+    pir::Operation* op,
+    const ValueExecutionInfo* value_exec_info)
+    : OneDNNPhiKernelInstruction(id, place, op, value_exec_info) {}
+
+void OneDNNMixedPhiKernelInstruction::Run() {
+  // Step1. Mixed Dynamic Choose Kernel
+  // todo if (input_tensor.layout() != phi::DataLayout::ONEDNN)
+
+  OneDNNPhiKernelInstruction::Run();
+}
+
+}  // namespace framework
+}  // namespace paddle
@@ -0,0 +1,42 @@
+// Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include "paddle/fluid/framework/new_executor/instruction/onednn/onednn_phi_kernel_instruction.h"
+
+namespace pir {
+class Operation;
+}  // namespace pir
+
+namespace paddle {
+namespace framework {
+class Scope;
+class ValueExecutionInfo;
+
+using RuntimeAttribute = phi::Attribute;
+using PIRAttribute = pir::Attribute;
+
+class OneDNNMixedPhiKernelInstruction : public OneDNNPhiKernelInstruction {
+ public:
+  OneDNNMixedPhiKernelInstruction(size_t id,
+                                  const platform::Place& place,
+                                  ::pir::Operation* op,
+                                  const ValueExecutionInfo* value_exec_info);
+
+  void Run() override;
+};
+
+}  // namespace framework
+}  // namespace paddle