From ff69d4fdab2557a66b5fdd9b7c06fa4090040436 Mon Sep 17 00:00:00 2001
From: unknown <zhaozhixuan2@hisilicon.com>
Date: Sat, 9 Jan 2021 13:57:49 +0800
Subject: [PATCH] For aicpu all_shape compile.

---
 ge/hybrid/node_executor/aicpu/aicpu_ext_info.cc | 13 +++++++++++++
 ge/hybrid/node_executor/aicpu/aicpu_ext_info.h  |  1 +
 third_party/fwkacllib/inc/cce/fwk_adpt_struct.h |  1 +
 3 files changed, 15 insertions(+)

diff --git a/ge/hybrid/node_executor/aicpu/aicpu_ext_info.cc b/ge/hybrid/node_executor/aicpu/aicpu_ext_info.cc
index b8acbf0e..88941429 100644
--- a/ge/hybrid/node_executor/aicpu/aicpu_ext_info.cc
+++ b/ge/hybrid/node_executor/aicpu/aicpu_ext_info.cc
@@ -63,6 +63,9 @@ Status AicpuExtInfoHandler::Parse(const std::string &ext_info) {
       case aicpu::FWKAdapter::FWK_ADPT_EXT_SESSION_INFO:
         GE_CHK_STATUS_RET(ParseExtSessionInfo(aicpu_ext_info), "Parse ext session info failed.");
         break;
+      case aicpu::FWKAdapter::FWK_ADPT_EXT_BITMAP:
+        GE_CHK_STATUS_RET(ParseExtBitMap(aicpu_ext_info), "Parse ext session info failed.");
+        break;
       default:
         GELOGD("Node[%s] ignore infoType=%d, infoLen=%u.",
                node_name_.c_str(), aicpu_ext_info->infoType, aicpu_ext_info->infoLen);
@@ -139,6 +142,16 @@ Status AicpuExtInfoHandler::ParseExtSessionInfo(AicpuExtInfo *aicpu_ext_info) {
   return SUCCESS;
 }
 
+Status AicpuExtInfoHandler::ParseExtBitMap(AicpuExtInfo *aicpu_ext_info) {
+  GE_CHK_BOOL_RET_STATUS(aicpu_ext_info->infoLen == sizeof(uint64_t), PARAM_INVALID,
+                         "Node[%s] parse bit_map info failed as infoLen must be %zu but %u.",
+                         node_name_.c_str(), sizeof(uint64_t), aicpu_ext_info->infoLen);
+
+  bit_map_ = reinterpret_cast<uint64_t *>(aicpu_ext_info->infoMsg);
+  GELOGI("Node[%s] bit_map info success infoLen=%u.", node_name_.c_str(), aicpu_ext_info->infoLen);
+  return SUCCESS;
+}
+
 Status AicpuExtInfoHandler::UpdateSessionInfo(uint64_t session_id, uint64_t kernel_id, bool sess_flag) {
   if (session_info_ == nullptr) {
     GELOGD("There is no session info in ext_info, no need update.");
diff --git a/ge/hybrid/node_executor/aicpu/aicpu_ext_info.h b/ge/hybrid/node_executor/aicpu/aicpu_ext_info.h
index 2defba8f..3d0643ea 100644
--- a/ge/hybrid/node_executor/aicpu/aicpu_ext_info.h
+++ b/ge/hybrid/node_executor/aicpu/aicpu_ext_info.h
@@ -80,6 +80,7 @@ class AicpuExtInfoHandler {
   const uint32_t output_num_;
   UnknowShapeOpType unknown_type_;
   AicpuSessionInfo *session_info_ = nullptr;
+  uint64_t *bit_map_ = nullptr;
 
   std::unique_ptr<uint8_t[]> ext_info_;
   size_t ext_info_len_ = 0;
diff --git a/third_party/fwkacllib/inc/cce/fwk_adpt_struct.h b/third_party/fwkacllib/inc/cce/fwk_adpt_struct.h
index 50b39d91..7a2cbc50 100644
--- a/third_party/fwkacllib/inc/cce/fwk_adpt_struct.h
+++ b/third_party/fwkacllib/inc/cce/fwk_adpt_struct.h
@@ -60,6 +60,7 @@ enum FWKTaskExtInfoType {
   FWK_ADPT_EXT_UPDATE_ADDR,
   FWK_ADPT_EXT_OP_NAME,
   FWK_ADPT_EXT_SESSION_INFO,
+  FWK_ADPT_EXT_BITMAP,
   FWK_ADPT_EXT_INVALID
 };