diff options
| author | Jim Flynn <jim.flynn@arm.com> | 2019-12-04 10:07:20 +0000 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-12-04 17:07:07 +0000 |
| commit | fc3656235e4138b65ac107aa01fc9845a86ff2ab (patch) | |
| tree | e022417140c58fa18adedc1d2126af48976546a9 | |
| parent | 6198fe0f653fb60c938a3c269bf28aeefcdad07e (diff) | |
| download | armnn-fc3656235e4138b65ac107aa01fc9845a86ff2ab.tar.gz | |
IVGCVSW-4223 Change PeriodicCounterCapture Packet Family to 3
Change-Id: Ibc166c25d8d5fd09f407c0c697217a57b84d8cdc
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
| -rw-r--r-- | src/profiling/SendCounterPacket.cpp | 2 | ||||
| -rw-r--r-- | src/profiling/test/ProfilingTests.cpp | 2 | ||||
| -rw-r--r-- | src/profiling/test/SendCounterPacketTests.cpp | 4 | ||||
| -rw-r--r-- | tests/profiling/gatordmock/GatordMockMain.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/profiling/SendCounterPacket.cpp b/src/profiling/SendCounterPacket.cpp index a9846c9f06..5badea9d83 100644 --- a/src/profiling/SendCounterPacket.cpp +++ b/src/profiling/SendCounterPacket.cpp @@ -814,7 +814,7 @@ void SendCounterPacket::SendPeriodicCounterCapturePacket(uint64_t timestamp, con uint32_t uint32_t_size = sizeof(uint32_t); uint32_t uint64_t_size = sizeof(uint64_t); - uint32_t packetFamily = 1; + uint32_t packetFamily = 3; uint32_t packetClass = 0; uint32_t packetType = 0; uint32_t headerSize = 2 * uint32_t_size; diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index 73f1c20246..47a686a883 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -2022,7 +2022,7 @@ BOOST_AUTO_TEST_CASE(CheckPeriodicCounterCaptureThread) uint32_t headerWord0 = ReadUint32(buffer, 0); uint32_t headerWord1 = ReadUint32(buffer, 4); - BOOST_TEST(((headerWord0 >> 26) & 0x0000003F) == 1); // packet family + BOOST_TEST(((headerWord0 >> 26) & 0x0000003F) == 3); // packet family BOOST_TEST(((headerWord0 >> 19) & 0x0000007F) == 0); // packet class BOOST_TEST(((headerWord0 >> 16) & 0x00000007) == 0); // packet type BOOST_TEST(headerWord1 == 20); diff --git a/src/profiling/test/SendCounterPacketTests.cpp b/src/profiling/test/SendCounterPacketTests.cpp index b4564fec29..cd9cf06e7e 100644 --- a/src/profiling/test/SendCounterPacketTests.cpp +++ b/src/profiling/test/SendCounterPacketTests.cpp @@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(SendPeriodicCounterCapturePacketTest) uint32_t headerWord1 = ReadUint32(readBuffer2, 4); uint64_t readTimestamp = ReadUint64(readBuffer2, 8); - BOOST_TEST(((headerWord0 >> 26) & 0x0000003F) == 1); // packet family + BOOST_TEST(((headerWord0 >> 26) & 0x0000003F) == 3); // packet family BOOST_TEST(((headerWord0 >> 19) & 0x0000007F) == 0); // packet class BOOST_TEST(((headerWord0 >> 16) & 0x00000007) == 0); // packet type BOOST_TEST(headerWord1 == 8); // data length @@ -243,7 +243,7 @@ BOOST_AUTO_TEST_CASE(SendPeriodicCounterCapturePacketTest) headerWord1 = ReadUint32(readBuffer3, 4); uint64_t readTimestamp2 = ReadUint64(readBuffer3, 8); - BOOST_TEST(((headerWord0 >> 26) & 0x0000003F) == 1); // packet family + BOOST_TEST(((headerWord0 >> 26) & 0x0000003F) == 3); // packet family BOOST_TEST(((headerWord0 >> 19) & 0x0000007F) == 0); // packet class BOOST_TEST(((headerWord0 >> 16) & 0x00000007) == 0); // packet type BOOST_TEST(headerWord1 == 38); // data length diff --git a/tests/profiling/gatordmock/GatordMockMain.cpp b/tests/profiling/gatordmock/GatordMockMain.cpp index 5f15db9002..edad85cffe 100644 --- a/tests/profiling/gatordmock/GatordMockMain.cpp +++ b/tests/profiling/gatordmock/GatordMockMain.cpp @@ -33,7 +33,7 @@ int main(int argc, char* argv[]) 0, 4, packetVersionResolver.ResolvePacketVersion(0, 4).GetEncodedValue()); // This functor will receive the counter data. armnn::gatordmock::PeriodicCounterCaptureCommandHandler counterCaptureCommandHandler( - 1, 0, packetVersionResolver.ResolvePacketVersion(1, 0).GetEncodedValue()); + 3, 0, packetVersionResolver.ResolvePacketVersion(3, 0).GetEncodedValue()); armnn::profiling::DirectoryCaptureCommandHandler directoryCaptureCommandHandler( 0, 2, packetVersionResolver.ResolvePacketVersion(0, 2).GetEncodedValue(), false); |