Filling some basic functions

Author: razvanapetroaie

src/plugins/intel_npu/src/plugin/include/blob_writer.hpp

@@ -19,23 +19,23 @@ class BlobWriter {
 public:
     BlobWriter();
 
-    void register_section(const ISection& section);
+    void register_section(const std::shared_ptr<ISection>& section);
 
     void register_offset_in_table(const ISection::SectionID id, const uint64_t offset);
 
     void write(std::ostream& stream, const std::shared_ptr<IGraph>& graph);
 
     void append_compatibility_requirement(const CREToken requirement_token);
 
-private:
-    void register_cre();
+    size_t offset = 0;
 
+private:
     void write_persistent_format_region();
 
-    std::unordered_set<ISection::SectionID> registered_sections_ids;
-    std::vector<ISection> registered_sections;
-    std::unordered_map<ISection::SectionID, uint64_t> offsets_table;
-    CRESection cre;
+    std::unordered_set<ISection::SectionID> m_registered_sections_ids;
+    std::vector<std::shared_ptr<ISection>> m_registered_sections;
+    std::unordered_map<ISection::SectionID, uint64_t> m_offsets_table;
+    std::shared_ptr<CRESection> m_cre;
 };
 
 }  // namespace intel_npu

src/plugins/intel_npu/src/plugin/include/cre.hpp

@@ -12,8 +12,6 @@ using CREToken = uint16_t;
 
 class CRESection final : public ISection {
 public:
-    static constexpr SectionID id = 100;
-
     CRESection();
 
     void write(std::ostream& stream, BlobWriter* writer) override;
@@ -23,7 +21,7 @@ class CRESection final : public ISection {
     void append_to_expression(const CREToken requirement_token);
 
 private:
-    std::vector<CREToken> expression;
+    std::vector<CREToken> m_expression;
 };
 
 }  // namespace intel_npu

src/plugins/intel_npu/src/plugin/include/isection.hpp

@@ -27,7 +27,7 @@ class ISection {
     SectionID get_section_id();
 
 private:
-    SectionID section_id;
+    SectionID m_section_id;
 };
 
 }  // namespace intel_npu

src/plugins/intel_npu/src/plugin/src/blob_writer.cpp

@@ -6,8 +6,23 @@
 
 namespace intel_npu {
 
-BlobWriter::BlobWriter() {
-    register_cre();
+BlobWriter::BlobWriter() : m_cre(std::make_shared<CRESection>()) {
+    register_section(m_cre);
+}
+
+void BlobWriter::register_section(const std::shared_ptr<ISection>& section) {
+    m_registered_sections.push_back(section);
+    OPENVINO_ASSERT(!m_registered_sections_ids.count(section->get_section_id()));
+    m_registered_sections_ids.insert(section->get_section_id());
+}
+
+void BlobWriter::append_compatibility_requirement(const CREToken requirement_token) {
+    m_cre->append_to_expression(requirement_token);
+}
+
+void BlobWriter::register_offset_in_table(const ISection::SectionID id, const uint64_t offset) {
+    OPENVINO_ASSERT(!m_offsets_table.count(id));
+    m_offsets_table[id] = offset;
 }
 
 }  // namespace intel_npu

src/plugins/intel_npu/src/plugin/src/cre.cpp

@@ -4,4 +4,31 @@
 
 #include "cre.hpp"
 
-namespace intel_npu {}  // namespace intel_npu
+namespace {
+
+constexpr intel_npu::ISection::SectionID CRE_SECTION_ID = 100;
+
+constexpr intel_npu::CREToken AND = 50000;
+constexpr intel_npu::CREToken OR = 50001;
+constexpr intel_npu::CREToken OPEN = 50002;
+constexpr intel_npu::CREToken CLOSE = 50003;
+
+const std::unordered_set<intel_npu::CREToken> RESERVED_TOKENS{AND, OR, OPEN, CLOSE};
+
+}  // namespace
+
+namespace intel_npu {
+
+CRESection::CRESection() : ISection(CRE_SECTION_ID), m_expression({AND}) {}
+
+void CRESection::append_to_expression(const CREToken requirement_token) {
+    OPENVINO_ASSERT(!RESERVED_TOKENS.count(requirement_token));
+    m_expression.push_back(requirement_token);
+}
+
+void CRESection::write(std::ostream& stream, BlobWriter* writer) {
+    stream.write(reinterpret_cast<const char*>(m_expression.data()), m_expression.size());
+    writer->offset += m_expression.size();
+}
+
+}  // namespace intel_npu

src/plugins/intel_npu/src/plugin/src/isection.cpp

@@ -4,4 +4,12 @@
 
 #include "isection.hpp"
 
-namespace intel_npu {}  // namespace intel_npu
+namespace intel_npu {
+
+ISection::ISection(const SectionID section_id) : m_section_id(section_id) {}
+
+ISection::SectionID ISection::get_section_id() {
+    return m_section_id;
+}
+
+}  // namespace intel_npu