Fix benchmark_model compilation on Windows
Use std::this_thread::sleep_for on Windows. Fixes #24475 PiperOrigin-RevId: 226530323
This commit is contained in:
parent
08a692fe30
commit
a025c7a21c
@ -41,6 +41,17 @@ cc_library(
|
||||
copts = common_copts,
|
||||
)
|
||||
|
||||
cc_test(
|
||||
name = "time_test",
|
||||
srcs = ["time_test.cc"],
|
||||
copts = common_copts,
|
||||
deps = [
|
||||
":time",
|
||||
"//tensorflow/lite/testing:util",
|
||||
"@com_google_googletest//:gtest",
|
||||
],
|
||||
)
|
||||
|
||||
cc_library(
|
||||
name = "profile_summarizer",
|
||||
srcs = ["profile_summarizer.cc"],
|
||||
|
@ -16,8 +16,10 @@ limitations under the License.
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#include <chrono> // NOLINT(build/c++11)
|
||||
#include <thread> // NOLINT(build/c++11)
|
||||
#else
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
namespace tflite {
|
||||
@ -32,12 +34,24 @@ uint64_t NowMicros() {
|
||||
.count();
|
||||
}
|
||||
|
||||
void SleepForMicros(uint64_t micros) {
|
||||
std::this_thread::sleep_for(std::chrono::microseconds(micros));
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
uint64_t NowMicros() {
|
||||
struct timeval tv;
|
||||
gettimeofday(&tv, nullptr);
|
||||
return static_cast<uint64_t>(tv.tv_sec) * 1000000 + tv.tv_usec;
|
||||
return static_cast<uint64_t>(tv.tv_sec) * 1e6 + tv.tv_usec;
|
||||
}
|
||||
|
||||
void SleepForMicros(uint64_t micros) {
|
||||
timespec sleep_time;
|
||||
sleep_time.tv_sec = micros / 1e6;
|
||||
micros -= sleep_time.tv_sec * 1e6;
|
||||
sleep_time.tv_nsec = micros * 1e3;
|
||||
nanosleep(&sleep_time, nullptr);
|
||||
}
|
||||
|
||||
#endif // defined(_MSC_VER)
|
||||
|
@ -21,6 +21,7 @@ namespace tflite {
|
||||
namespace profiling {
|
||||
namespace time {
|
||||
uint64_t NowMicros();
|
||||
void SleepForMicros(uint64_t micros);
|
||||
} // namespace time
|
||||
} // namespace profiling
|
||||
} // namespace tflite
|
||||
|
56
tensorflow/lite/profiling/time_test.cc
Normal file
56
tensorflow/lite/profiling/time_test.cc
Normal file
@ -0,0 +1,56 @@
|
||||
/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
==============================================================================*/
|
||||
|
||||
#include "tensorflow/lite/profiling/time.h"
|
||||
#include <gtest/gtest.h>
|
||||
#include "tensorflow/lite/testing/util.h"
|
||||
|
||||
namespace tflite {
|
||||
namespace profiling {
|
||||
namespace time {
|
||||
|
||||
TEST(TimeTest, NowMicros) {
|
||||
auto now0 = NowMicros();
|
||||
EXPECT_GT(now0, 0);
|
||||
auto now1 = NowMicros();
|
||||
EXPECT_GE(now1, now0);
|
||||
}
|
||||
|
||||
TEST(TimeTest, SleepForMicros) {
|
||||
// A zero sleep shouldn't cause issues.
|
||||
SleepForMicros(0);
|
||||
|
||||
// Sleeping should be reflected in the current time.
|
||||
auto now0 = NowMicros();
|
||||
SleepForMicros(50);
|
||||
auto now1 = NowMicros();
|
||||
EXPECT_GE(now1, now0 + 50);
|
||||
|
||||
// Sleeping more than a second should function properly.
|
||||
now0 = NowMicros();
|
||||
SleepForMicros(1e6 + 50);
|
||||
now1 = NowMicros();
|
||||
EXPECT_GE(now1, now0 + 1e6 + 50);
|
||||
}
|
||||
|
||||
} // namespace time
|
||||
} // namespace profiling
|
||||
} // namespace tflite
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
::tflite::LogToStderr();
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
@ -15,8 +15,6 @@ limitations under the License.
|
||||
|
||||
#include "tensorflow/lite/tools/benchmark/benchmark_model.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
@ -28,18 +26,11 @@ void SleepForSeconds(double sleep_seconds) {
|
||||
if (sleep_seconds <= 0.0) {
|
||||
return;
|
||||
}
|
||||
// Convert the run_delay string into a timespec.
|
||||
timespec req;
|
||||
req.tv_sec = static_cast<time_t>(sleep_seconds);
|
||||
req.tv_nsec = (sleep_seconds - req.tv_sec) * 1000000000;
|
||||
// If requested, sleep between runs for an arbitrary amount of time.
|
||||
// This can be helpful to determine the effect of mobile processor
|
||||
// scaling and thermal throttling.
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
Sleep(sleep_seconds * 1000);
|
||||
#else
|
||||
nanosleep(&req, nullptr);
|
||||
#endif
|
||||
return tflite::profiling::time::SleepForMicros(
|
||||
static_cast<uint64_t>(sleep_seconds * 1e6));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
Loading…
Reference in New Issue
Block a user