Rollback flaky test

PiperOrigin-RevId: 227959516
This commit is contained in:
A. Unique TensorFlower 2019-01-04 22:49:14 -08:00 committed by TensorFlower Gardener
parent 20dc97f0f1
commit 058bb7c351
2 changed files with 5 additions and 44 deletions

View File

@ -3813,7 +3813,6 @@ tf_cc_tests(
"//tensorflow/core/kernels:ops_util",
"//third_party/eigen3",
"@com_google_absl//absl/base",
"@com_google_absl//absl/time",
],
)

View File

@ -15,7 +15,6 @@ limitations under the License.
#include <array>
#include "absl/time/clock.h"
#include "tensorflow/core/platform/env.h"
#include "tensorflow/core/platform/fingerprint.h"
#include "tensorflow/core/platform/test.h"
@ -53,48 +52,11 @@ TEST(PresizedCuckooMapTest, Basic) {
}
TEST(PresizedCuckooMapTest, Prefetch) {
{
PresizedCuckooMap<int64> pscm(2);
EXPECT_TRUE(pscm.InsertUnique(1, 2));
// Works for both present and absent keys.
pscm.PrefetchKey(1);
pscm.PrefetchKey(2);
}
// Do not run in debug mode, when prefetch is not implemented, or when
// sanitizers are enabled.
#if defined(NDEBUG) && defined(__GNUC__) && !defined(ADDRESS_SANITIZER) && \
!defined(MEMORY_SANITIZER) && !defined(THREAD_SANITIZER) && \
!defined(UNDEFINED_BEHAVIOR_SANITIZER)
const auto now = [] { return absl::Now(); };
// Make size enough to not fit in L2 cache (16.7 Mb)
static constexpr int size = 1 << 22;
PresizedCuckooMap<int64> pscm(size);
for (int i = 0; i < size; ++i) {
pscm.InsertUnique(i, i);
}
absl::Duration no_prefetch, prefetch;
int64 out;
for (int iter = 0; iter < 10; ++iter) {
auto time = now();
for (int i = 0; i < size; ++i) {
testing::DoNotOptimize(pscm.Find(i, &out));
}
no_prefetch += now() - time;
time = now();
for (int i = 0; i < size; ++i) {
pscm.PrefetchKey(i + 20);
testing::DoNotOptimize(pscm.Find(i, &out));
}
prefetch += now() - time;
}
// no_prefetch is at least 30% slower.
EXPECT_GE(1.0 * no_prefetch / prefetch, 1.3);
#endif
PresizedCuckooMap<int64> pscm(2);
EXPECT_TRUE(pscm.InsertUnique(1, 2));
// Works for both present and absent keys.
pscm.PrefetchKey(1);
pscm.PrefetchKey(2);
}
TEST(PresizedCuckooMapTest, TooManyItems) {