Reland: Add ETC1 powered SSE encoder for tile texture compression

cc/resources/texture_compressor_perftest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 #include "cc/debug/lap_timer.h"
 #include "cc/resources/texture_compressor.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 
 namespace cc {
 namespace {
 
 const int kTimeLimitMillis = 2000;
 const int kWarmupRuns = 5;
 const int kTimeCheckInterval = 10;
 
 const int kImageWidth = 256;
 const int kImageHeight = 256;
-const int kImageSizeInBytes = kImageWidth * kImageHeight * 4;
-
-const TextureCompressor::Quality kQualities[] = {
-    TextureCompressor::kQualityLow,
-    TextureCompressor::kQualityMedium,
-    TextureCompressor::kQualityHigh};
+const int kImageChannels = 4;
+const int kImageSizeInBytes = kImageWidth * kImageHeight * kImageChannels;
 
 std::string FormatName(TextureCompressor::Format format) {
   switch (format) {
     case TextureCompressor::kFormatETC1:
       return "ETC1";
   }
 
   NOTREACHED();
   return "";
 }
 
 std::string QualityName(TextureCompressor::Quality quality) {
   switch (quality) {
     case TextureCompressor::kQualityLow:
       return "Low";
     case TextureCompressor::kQualityMedium:
       return "Medium";
     case TextureCompressor::kQualityHigh:
       return "High";
   }
 
   NOTREACHED();
   return "";
 }
 
 class TextureCompressorPerfTest
-    : public testing::TestWithParam<TextureCompressor::Format> {
+    : public testing::TestWithParam<
+          ::testing::tuple<TextureCompressor::Quality,
+                           TextureCompressor::Format>> {
  public:
   TextureCompressorPerfTest()
       : timer_(kWarmupRuns,
                base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                kTimeCheckInterval) {}
 
   void SetUp() override {
-    TextureCompressor::Format format = GetParam();
+    quality_ = ::testing::get<0>(GetParam());
+    TextureCompressor::Format format = ::testing::get<1>(GetParam());
     compressor_ = TextureCompressor::Create(format);
   }
 
   void RunTest(const std::string& name, TextureCompressor::Quality quality) {

[reveman, 2015/05/07 14:24:35]

nit: please remove the quality parameter/member and instead add

TextureCompressor::Quality quality = ::testing::get<1>(GetParam())

as the first line of this function.

[radu.velea, 2015/05/07 15:53:46]

Done.

     timer_.Reset();
     do {
       compressor_->Compress(src_, dst_, kImageWidth, kImageHeight, quality);
       timer_.NextLap();
     } while (!timer_.HasTimeLimitExpired());
 
-    std::string str = FormatName(GetParam()) + " " + QualityName(quality);
+    std::string str =
+        FormatName(::testing::get<1>(GetParam())) + " " + QualityName(quality);

[reveman, 2015/05/07 14:24:35]

nit: please add a TextureCompressor::Format format =
::testing::get<1>(GetParam()) just above this line to make it a bit easier to
understand what this value we get from get<1>(GetParam()) is

[radu.velea, 2015/05/07 15:53:46]

Done.

     perf_test::PrintResult("Compress256x256", name, str, timer_.MsPerLap(),
                            "us", true);
   }
 
  protected:
+  TextureCompressor::Quality quality_;
   LapTimer timer_;
   scoped_ptr<TextureCompressor> compressor_;
   uint8_t src_[kImageSizeInBytes];
   uint8_t dst_[kImageSizeInBytes];
 };
 
-TEST_P(TextureCompressorPerfTest, Compress256x256Image) {
+TEST_P(TextureCompressorPerfTest, Compress256x256BlackAndWhiteGradientImage) {
   for (int i = 0; i < kImageSizeInBytes; ++i)
     src_[i] = i % 256;
 
-  for (auto& quality : kQualities)
-    RunTest("Image", quality);
+  RunTest("BlackAndWhiteGradientImage", quality_);
 }
 
-TEST_P(TextureCompressorPerfTest, Compress256x256SolidImage) {
+TEST_P(TextureCompressorPerfTest, Compress256x256SolidBlackImage) {
   memset(src_, 0, kImageSizeInBytes);
 
-  for (auto& quality : kQualities)
-    RunTest("SolidImage", quality);
+  RunTest("SolidBlackImage", quality_);
 }
 
-INSTANTIATE_TEST_CASE_P(TextureCompressorPerfTests,
-                        TextureCompressorPerfTest,
-                        ::testing::Values(TextureCompressor::kFormatETC1));
+TEST_P(TextureCompressorPerfTest, Compress256x256SolidColorImage) {
+  for (int i = 0; i < kImageSizeInBytes; ++i)
+    src_[i] = (4 - i % 4) * 50;
+
+  RunTest("SolidColorImage", quality_);
+}
+
+TEST_P(TextureCompressorPerfTest, Compress256x256RandomColorImage) {
+  unsigned int kImageSeed = 1234567890;
+// On Windows, rand() is threadsafe, and rand_r() is not available.
+#if defined(OS_WIN)

[reveman, 2015/05/07 14:24:35]

do we need this ifdef? we use srand and std::rand unconditionally in some other
tests. see content/common/discardable_shared_memory_heap_perftest.cc for
example. I'd prefer if you removed this ifdef.

[radu.velea, 2015/05/07 15:53:46]

Done.

+  srand(kImageSeed);
+  for (int i = 0; i < kImageSizeInBytes; ++i)
+    src_[i] = rand() % 256;  // NOLINT
+#else
+  for (int i = 0; i < kImageSizeInBytes; ++i)
+    src_[i] = rand_r(&kImageSeed) % 256;
+#endif
+  RunTest("RandomColorImage", quality_);
+}
+
+INSTANTIATE_TEST_CASE_P(
+    TextureCompressorPerfTests,
+    TextureCompressorPerfTest,
+    ::testing::Combine(::testing::Values(TextureCompressor::kQualityLow,
+                                         TextureCompressor::kQualityMedium,
+                                         TextureCompressor::kQualityHigh),
+                       ::testing::Values(TextureCompressor::kFormatETC1)));
 
 }  // namespace
 }  // namespace cc