Mesa (main): clc: drop parsingComplete check

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat May 21 12:59:27 UTC 2022


Module: Mesa
Branch: main
Commit: e5a052f75fd84c13e3400db023c9e7399f68d075
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5a052f75fd84c13e3400db023c9e7399f68d075

Author: Karol Herbst <kherbst at redhat.com>
Date:   Sat Apr 23 10:48:51 2022 +0200

clc: drop parsingComplete check

This relies too much on the properties of the SPIRV-LLVM-Translator and is
required to load SPIR-Vs found in the OpenCL CTS.

Signed-off-by: Karol Herbst <kherbst at redhat.com>
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16479>

---

 src/compiler/clc/clc_helpers.cpp | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp
index 383f236e7e4..15f34a0d59d 100644
--- a/src/compiler/clc/clc_helpers.cpp
+++ b/src/compiler/clc/clc_helpers.cpp
@@ -628,21 +628,6 @@ public:
       return SPV_SUCCESS;
    }
 
-   bool parsingComplete()
-   {
-      for (auto &kernel : kernels) {
-         if (kernel.name.empty())
-            return false;
-
-         for (auto &arg : kernel.args) {
-            if (arg.name.empty() || arg.typeName.empty())
-               return false;
-         }
-      }
-
-      return true;
-   }
-
    bool parseBinary(const struct clc_binary &spvbin, const struct clc_logger *logger)
    {
       /* 3 passes should be enough to retrieve all kernel information:
@@ -661,13 +646,9 @@ public:
                logger->error(logger->priv, diagnostic->error);
             return false;
          }
-
-         if (parsingComplete())
-            return true;
       }
 
-      assert(0);
-      return false;
+      return true;
    }
 
    std::vector<SPIRVKernelInfo> kernels;



More information about the mesa-commit mailing list