diff options
author | Nina Drozd <nina.drozd@arm.com> | 2018-09-27 11:53:34 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:57 +0100 |
commit | 2d9dd36fb6bc20b370701ab15463359b9db35f18 (patch) | |
tree | cc8dc033dd61ee4ec306201c50564a4f59cf79d9 /src/armnn/test/JsonPrinterTests.cpp | |
parent | 69851b525b9040ee7bf4b796efe74d473bc4e321 (diff) | |
download | armnn-2d9dd36fb6bc20b370701ab15463359b9db35f18.tar.gz |
IVGCVSW-1821 - taking out scale factor again as it's polluting the WallClockTimer interface
Change-Id: Ia90b709ddfff321dbc218add4ab19737f68a44bf
Diffstat (limited to 'src/armnn/test/JsonPrinterTests.cpp')
-rw-r--r-- | src/armnn/test/JsonPrinterTests.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/armnn/test/JsonPrinterTests.cpp b/src/armnn/test/JsonPrinterTests.cpp index 01078e3666..aae7dba0f5 100644 --- a/src/armnn/test/JsonPrinterTests.cpp +++ b/src/armnn/test/JsonPrinterTests.cpp @@ -246,7 +246,7 @@ void SetupSoftmaxProfilerWithSpecifiedBackendsAndValidateJSONPrinterResult( std::string backend = "Ref"; std::string changeLine31 = "\n},\n\"CopyMemGeneric_Execute\": {"; - std::string changeLine39 = "ms\""; + std::string changeLine39 = "us\""; std::string changeLine40; std::string changeLine45; @@ -271,7 +271,7 @@ void SetupSoftmaxProfilerWithSpecifiedBackendsAndValidateJSONPrinterResult( , ], -"unit": "ms")"; +"unit": "us")"; changeLine45 = "}\n"; break; case armnn::Compute::CpuAcc: backend = "Neon"; @@ -301,7 +301,7 @@ void SetupSoftmaxProfilerWithSpecifiedBackendsAndValidateJSONPrinterResult( , ], -"unit": "ms")"; +"unit": "us")"; changeLine45 = "}\n"; break; default: @@ -315,21 +315,21 @@ void SetupSoftmaxProfilerWithSpecifiedBackendsAndValidateJSONPrinterResult( , ], -"unit": "ms", +"unit": "us", "layer_measurements": { "raw": [ , , ], -"unit": "ms", +"unit": "us", "CopyMemGeneric_Execute": { "raw": [ , , ], -"unit": "ms" +"unit": "us" }, ")" + backend + R"(SoftmaxUintWorkload_Execute": { "raw": [ @@ -337,7 +337,7 @@ void SetupSoftmaxProfilerWithSpecifiedBackendsAndValidateJSONPrinterResult( , ], -"unit": "ms")" + changeLine31 + R"( +"unit": "us")" + changeLine31 + R"( "raw": [ , , |