1 files changed, 46 insertions, 0 deletions
diff --git a/host/tests/rfnoc_chdr_test.cpp b/host/tests/rfnoc_chdr_test.cpp
index 417ed2f96..1c63d5976 100644
--- a/host/tests/rfnoc_chdr_test.cpp
+++ b/host/tests/rfnoc_chdr_test.cpp
@@ -222,3 +222,49 @@ BOOST_AUTO_TEST_CASE(chdr_strc_packet_no_swap_64)
         std::cout << pyld.to_string();
     }
 }
+
+BOOST_AUTO_TEST_CASE(chdr_generic_packet_calculate_pyld_offset_64)
+{
+    // Check calculation without timestamp
+    auto test_pyld_offset = [](chdr_packet::uptr& pkt,
+        const packet_type_t pkt_type,
+        const size_t num_mdata)
+    {
+        uint64_t buff[MAX_BUF_SIZE_WORDS];
+        chdr_header header;
+        header.set_pkt_type(pkt_type);
+        header.set_num_mdata(num_mdata);
+
+        pkt->refresh(reinterpret_cast<void*>(buff), header, 0);
+
+        const size_t pyld_offset = pkt->calculate_payload_offset(
+            pkt_type, num_mdata);
+
+        void* pyld_ptr = pkt->get_payload_ptr();
+
+        const size_t non_pyld_bytes = static_cast<size_t>(
+            reinterpret_cast<uint8_t*>(pyld_ptr) -
+            reinterpret_cast<uint8_t*>(buff));
+
+        BOOST_CHECK(pyld_offset == non_pyld_bytes);
+    };
+
+    {
+        chdr_packet::uptr pkt = chdr64_be_factory.make_generic();
+        test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 0);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 1);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 2);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_WITH_TS, 0);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_WITH_TS, 1);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_WITH_TS, 2);
+    }
+    {
+        chdr_packet::uptr pkt = chdr256_be_factory.make_generic();
+        test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 0);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 1);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_NO_TS, 2);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_WITH_TS, 0);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_WITH_TS, 1);
+        test_pyld_offset(pkt, PKT_TYPE_DATA_WITH_TS, 2);
+    }
+}