Update gpu_test_expectations

src/tests/third_party/gpu_test_expectations/angle_config.h

@@ -21,6 +21,7 @@
 #define DCHECK_NE(A, B) ASSERT((A) != (B))
 #define DCHECK(X) ASSERT(X)
 #define DLOG(X) std::cerr
+#define DVLOG(X) std::cerr
 #define LOG(X) std::cerr
 
 #define GPU_EXPORT
@@ -48,6 +49,7 @@ class Size
   public:
     int width() const { return 0; }
     int height() const { return 0; }
+    std::string ToString() const { return "0x0"; }
 };
 }  // namespace gfx
 
@@ -64,6 +66,8 @@ struct DxDiagNode
 #    define OS_LINUX
 #elif defined(__APPLE__)
 #    define OS_MACOSX
+#elif defined(__Fuchsia__)
+#    define OS_FUCHSIA
 #else
 #    error "Unsupported platform"
 #endif

src/tests/third_party/gpu_test_expectations/gpu_test_config.cc

@@ -99,32 +99,36 @@ GPUTestConfig::OS GetCurrentOS() {
         return GPUTestConfig::kOsMacSierra;
       case 13:
         return GPUTestConfig::kOsMacHighSierra;
+      case 14:
+        return GPUTestConfig::kOsMacMojave;
     }
   }
 #elif defined(OS_ANDROID)
   return GPUTestConfig::kOsAndroid;
+#elif defined(OS_FUCHSIA)
+  return GPUTestConfig::kOsFuchsia;
 #endif
   return GPUTestConfig::kOsUnknown;
 }
 
 #if !defined(OS_ANDROID)
-CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
+bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   angle::SystemInfo info;
   if (!angle::GetSystemInfo(&info)) {
-    return kCollectInfoFatalFailure;
+    return false;
   }
   const angle::GPUDeviceInfo& gpu = info.gpus[info.primaryGPUIndex];
   gpu_info->gpu.vendor_id = gpu.vendorId;
   gpu_info->gpu.device_id = gpu.deviceId;
   gpu_info->gpu.active = true;
-  return kCollectInfoSuccess;
+  return true;
 }
 #else
-CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
+bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   gpu_info->gpu.vendor_id = 0;
   gpu_info->gpu.device_id = 0;
   gpu_info->gpu.active = true;
-  return kCollectInfoNonFatalFailure;
+  return false;
 }
 #endif  // defined(OS_ANDROID)
 }  // namespace anonymous
@@ -138,11 +142,11 @@ GPUTestConfig::GPUTestConfig()
 
 GPUTestConfig::GPUTestConfig(const GPUTestConfig& other) = default;
 
-GPUTestConfig::~GPUTestConfig() {
-}
+GPUTestConfig::~GPUTestConfig() = default;
 
 void GPUTestConfig::set_os(int32_t os) {
-  DCHECK_EQ(0, os & ~(kOsAndroid | kOsWin | kOsMac | kOsLinux | kOsChromeOS));
+  DCHECK_EQ(0, os & ~(kOsAndroid | kOsWin | kOsMac | kOsLinux | kOsChromeOS |
+                      kOsFuchsia));
   os_ = os;
 }
 
@@ -214,8 +218,7 @@ void GPUTestConfig::ClearGPUVendor() {
   gpu_vendor_.clear();
 }
 
-GPUTestBotConfig::~GPUTestBotConfig() {
-}
+GPUTestBotConfig::~GPUTestBotConfig() = default;
 
 void GPUTestBotConfig::AddGPUVendor(uint32_t gpu_vendor) {
   DCHECK_EQ(0u, GPUTestConfig::gpu_vendor().size());
@@ -248,9 +251,11 @@ bool GPUTestBotConfig::IsValid() const {
     case kOsMacElCapitan:
     case kOsMacSierra:
     case kOsMacHighSierra:
+    case kOsMacMojave:
     case kOsLinux:
     case kOsChromeOS:
     case kOsAndroid:
+    case kOsFuchsia:
       break;
     default:
       return false;
@@ -309,10 +314,9 @@ bool GPUTestBotConfig::Matches(const std::string& config_data) const {
 
 bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
   bool rt;
-  if (gpu_info == NULL) {
+  if (!gpu_info) {
     GPUInfo my_gpu_info;
-    CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info);
-    if (result != kCollectInfoSuccess) {
+    if (!CollectBasicGraphicsInfo(&my_gpu_info)) {
       LOG(ERROR) << "Fail to identify GPU\n";
       DisableGPUInfoValidation();
       rt = true;
@@ -338,7 +342,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo* gpu_info) {
 // static
 bool GPUTestBotConfig::CurrentConfigMatches(const std::string& config_data) {
   GPUTestBotConfig my_config;
-  if (!my_config.LoadCurrentConfig(NULL))
+  if (!my_config.LoadCurrentConfig(nullptr))
     return false;
   return my_config.Matches(config_data);
 }
@@ -347,7 +351,7 @@ bool GPUTestBotConfig::CurrentConfigMatches(const std::string& config_data) {
 bool GPUTestBotConfig::CurrentConfigMatches(
     const std::vector<std::string>& configs) {
   GPUTestBotConfig my_config;
-  if (!my_config.LoadCurrentConfig(NULL))
+  if (!my_config.LoadCurrentConfig(nullptr))
     return false;
   for (size_t i = 0 ; i < configs.size(); ++i) {
     if (my_config.Matches(configs[i]))
@@ -362,4 +366,3 @@ bool GPUTestBotConfig::GpuBlacklistedOnBot() {
 }
 
 }  // namespace gpu
-

src/tests/third_party/gpu_test_expectations/gpu_test_config.h

@@ -12,16 +12,13 @@
 
 #include "angle_config.h"
 
-namespace gpu
-{
+namespace gpu {
 
 struct GPUInfo;
 
-class GPU_EXPORT GPUTestConfig
-{
+class GPU_EXPORT GPUTestConfig {
  public:
-    enum OS
-    {
+  enum OS {
     kOsUnknown = 0,
     kOsWinXP = 1 << 0,
     kOsWinVista = 1 << 1,
@@ -36,25 +33,25 @@ class GPU_EXPORT GPUTestConfig
     kOsMacElCapitan = 1 << 10,
     kOsMacSierra = 1 << 11,
     kOsMacHighSierra = 1 << 12,
-        kOsMac             = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion | kOsMacMountainLion |
-                 kOsMacMavericks | kOsMacYosemite | kOsMacElCapitan | kOsMacSierra |
-                 kOsMacHighSierra,
-        kOsLinux    = 1 << 13,
-        kOsChromeOS = 1 << 14,
-        kOsAndroid  = 1 << 15,
-        kOsWin10    = 1 << 16,
+    kOsMacMojave = 1 << 13,
+    kOsMac = kOsMacLeopard | kOsMacSnowLeopard | kOsMacLion |
+             kOsMacMountainLion | kOsMacMavericks | kOsMacYosemite |
+             kOsMacElCapitan | kOsMacSierra | kOsMacHighSierra | kOsMacMojave,
+    kOsLinux = 1 << 14,
+    kOsChromeOS = 1 << 15,
+    kOsAndroid = 1 << 16,
+    kOsWin10 = 1 << 17,
     kOsWin = kOsWinXP | kOsWinVista | kOsWin7 | kOsWin8 | kOsWin10,
+    kOsFuchsia = 1 << 18,
   };
 
-    enum BuildType
-    {
+  enum BuildType {
     kBuildTypeUnknown = 0,
     kBuildTypeRelease = 1 << 0,
     kBuildTypeDebug = 1 << 1,
   };
 
-    enum API
-    {
+  enum API {
     kAPIUnknown = 0,
     kAPID3D9 = 1 << 0,
     kAPID3D11 = 1 << 1,
@@ -64,7 +61,7 @@ class GPU_EXPORT GPUTestConfig
   };
 
   GPUTestConfig();
-    GPUTestConfig(const GPUTestConfig &other);
+  GPUTestConfig(const GPUTestConfig& other);
   virtual ~GPUTestConfig();
 
   void set_os(int32_t os);
@@ -75,7 +72,7 @@ class GPU_EXPORT GPUTestConfig
   virtual void AddGPUVendor(uint32_t gpu_vendor);
 
   int32_t os() const { return os_; }
-    const std::vector<uint32_t> &gpu_vendor() const { return gpu_vendor_; }
+  const std::vector<uint32_t>& gpu_vendor() const { return gpu_vendor_; }
   uint32_t gpu_device_id() const { return gpu_device_id_; }
   int32_t build_type() const { return build_type_; }
   int32_t api() const { return api_; }
@@ -86,7 +83,7 @@ class GPU_EXPORT GPUTestConfig
 
   // Check if two configs overlap, i.e., if there exists a config that matches
   // both configs.
-    bool OverlapsWith(const GPUTestConfig &config) const;
+  bool OverlapsWith(const GPUTestConfig& config) const;
 
   // Disable validation of GPU vendor and device ids.
   void DisableGPUInfoValidation();
@@ -115,17 +112,16 @@ class GPU_EXPORT GPUTestConfig
   int32_t api_;
 };
 
-class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig
-{
+class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig {
  public:
-    GPUTestBotConfig() {}
+  GPUTestBotConfig() = default;
   ~GPUTestBotConfig() override;
 
   // This should only be called when no gpu_vendor is added.
   void AddGPUVendor(uint32_t gpu_vendor) override;
 
   // Return false if gpu_info does not have valid vendor_id and device_id.
-    bool SetGPUInfo(const GPUInfo &gpu_info);
+  bool SetGPUInfo(const GPUInfo& gpu_info);
 
   // Check if the bot config is valid, i.e., if it is one valid test-bot
   // environment. For example, if a field is unknown, or if OS is not one
@@ -134,16 +130,16 @@ class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig
 
   // Check if a bot config matches a test config, i.e., the test config is a
   // superset of the bot config.
-    bool Matches(const GPUTestConfig &config) const;
-    bool Matches(const std::string &config_data) const;
+  bool Matches(const GPUTestConfig& config) const;
+  bool Matches(const std::string& config_data) const;
 
   // Setup the config with the current gpu testing environment.
-    // If gpu_info is NULL, collect GPUInfo first.
-    bool LoadCurrentConfig(const GPUInfo *gpu_info);
+  // If gpu_info is nullptr, collect GPUInfo first.
+  bool LoadCurrentConfig(const GPUInfo* gpu_info);
 
   // Check if this bot's config matches |config_data| or any of the |configs|.
-    static bool CurrentConfigMatches(const std::string &config_data);
-    static bool CurrentConfigMatches(const std::vector<std::string> &configs);
+  static bool CurrentConfigMatches(const std::string& config_data);
+  static bool CurrentConfigMatches(const std::vector<std::string>& configs);
 
   // Check if the bot has blacklisted all GPU features.
   static bool GpuBlacklistedOnBot();
@@ -152,3 +148,4 @@ class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig
 }  // namespace gpu
 
 #endif  // ANGLE_GPU_CONFIG_GPU_TEST_CONFIG_H_
+

src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.cc

@@ -75,6 +75,7 @@ enum Token {
   kConfigMacElCapitan,
   kConfigMacSierra,
   kConfigMacHighSierra,
+  kConfigMacMojave,
   kConfigMac,
   kConfigLinux,
   kConfigChromeOS,
@@ -132,6 +133,7 @@ const TokenInfo kTokenData[] = {
     {"elcapitan", GPUTestConfig::kOsMacElCapitan},
     {"sierra", GPUTestConfig::kOsMacSierra},
     {"highsierra", GPUTestConfig::kOsMacHighSierra},
+    {"mojave", GPUTestConfig::kOsMacMojave},
     {"mac", GPUTestConfig::kOsMac},
     {"linux", GPUTestConfig::kOsLinux},
     {"chromeos", GPUTestConfig::kOsChromeOS},
@@ -221,8 +223,7 @@ GPUTestExpectationsParser::GPUTestExpectationsParser() {
             sizeof(kErrorMessage) / sizeof(kErrorMessage[0]));
 }
 
-GPUTestExpectationsParser::~GPUTestExpectationsParser() {
-}
+GPUTestExpectationsParser::~GPUTestExpectationsParser() = default;
 
 bool GPUTestExpectationsParser::LoadTestExpectations(const std::string& data) {
   entries_.clear();
@@ -297,6 +298,7 @@ bool GPUTestExpectationsParser::ParseConfig(
       case kConfigMacElCapitan:
       case kConfigMacSierra:
       case kConfigMacHighSierra:
+      case kConfigMacMojave:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
@@ -359,6 +361,7 @@ bool GPUTestExpectationsParser::ParseLine(
       case kConfigMacElCapitan:
       case kConfigMacSierra:
       case kConfigMacHighSierra:
+      case kConfigMacMojave:
       case kConfigMac:
       case kConfigLinux:
       case kConfigChromeOS:
@@ -484,6 +487,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(GPUTestConfig* config,
     case kConfigMacElCapitan:
     case kConfigMacSierra:
     case kConfigMacHighSierra:
+    case kConfigMacMojave:
     case kConfigMac:
     case kConfigLinux:
     case kConfigChromeOS:

src/tests/third_party/gpu_test_expectations/gpu_test_expectations_parser.h

@@ -14,14 +14,11 @@
 #include "angle_config.h"
 #include "gpu_test_config.h"
 
-namespace gpu
-{
+namespace gpu {
 
-class GPU_EXPORT GPUTestExpectationsParser
-{
+class GPU_EXPORT GPUTestExpectationsParser {
  public:
-    enum GPUTestExpectation
-    {
+  enum GPUTestExpectation {
     kGpuTestPass = 1 << 0,
     kGpuTestFail = 1 << 1,
     kGpuTestFlaky = 1 << 2,
@@ -35,23 +32,22 @@ class GPU_EXPORT GPUTestExpectationsParser
   // Parse the text expectations, and if no error is encountered,
   // save all the entries. Otherwise, generate error messages.
   // Return true if parsing succeeds.
-    bool LoadTestExpectations(const std::string &data);
-    bool LoadTestExpectationsFromFile(const std::string &path);
+  bool LoadTestExpectations(const std::string& data);
+  bool LoadTestExpectationsFromFile(const std::string& path);
 
   // Query error messages from the last LoadTestExpectations() call.
-    const std::vector<std::string> &GetErrorMessages() const;
+  const std::vector<std::string>& GetErrorMessages() const;
 
   // Get the test expectation of a given test on a given bot.
-    int32_t GetTestExpectation(const std::string &test_name,
-                               const GPUTestBotConfig &bot_config) const;
+  int32_t GetTestExpectation(const std::string& test_name,
+                             const GPUTestBotConfig& bot_config) const;
 
   // Parse a list of config modifiers. If we have a valid entry with no
   // conflicts, | config | stores it, and the function returns true.
-    bool ParseConfig(const std::string &config_data, GPUTestConfig *config);
+  bool ParseConfig(const std::string& config_data, GPUTestConfig* config);
 
  private:
-    struct GPUTestExpectationEntry
-    {
+  struct GPUTestExpectationEntry {
     GPUTestExpectationEntry();
 
     std::string test_name;
@@ -62,14 +58,16 @@ class GPU_EXPORT GPUTestExpectationsParser
 
   // Parse a line of text. If we have a valid entry, save it; otherwise,
   // generate error messages.
-    bool ParseLine(const std::string &line_data, size_t line_number);
+  bool ParseLine(const std::string& line_data, size_t line_number);
 
   // Update OS/GPUVendor/BuildType modifiers. May generate an error message.
-    bool UpdateTestConfig(GPUTestConfig *config, int32_t token, size_t line_number);
+  bool UpdateTestConfig(GPUTestConfig* config,
+                        int32_t token,
+                        size_t line_number);
 
   // Update GPUDeviceID modifier. May generate an error message.
-    bool UpdateTestConfig(GPUTestConfig *config,
-                          const std::string &gpu_device_id,
+  bool UpdateTestConfig(GPUTestConfig* config,
+                        const std::string & gpu_device_id,
                         size_t line_number);
 
   // Check if two entries' config overlap with each other. May generate an
@@ -77,8 +75,8 @@ class GPU_EXPORT GPUTestExpectationsParser
   bool DetectConflictsBetweenEntries();
 
   // Save an error message, which can be queried later.
-    void PushErrorMessage(const std::string &message, size_t line_number);
-    void PushErrorMessage(const std::string &message,
+  void PushErrorMessage(const std::string& message, size_t line_number);
+  void PushErrorMessage(const std::string& message,
                         size_t entry1_line_number,
                         size_t entry2_line_number);
 
@@ -89,3 +87,4 @@ class GPU_EXPORT GPUTestExpectationsParser
 }  // namespace gpu
 
 #endif  // ANGLE_GPU_CONFIG_GPU_TEST_EXPECTATIONS_PARSER_H_
+