[Autobackout][FuncReg]Revert of change: 835e550

fcl options string *must* start with "-cmc" to invoke CM frontend

Author: aparshin-intel

IGC/AdaptorOCL/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.cpp

@@ -206,15 +206,9 @@ static std::vector<const char*>
     else
         llvm::cl::TokenizeGNUCommandLine(userArgsStr, stringSaver, userArgs);
 
-    if (std::getenv(UseLegacyCMCPrefixEnv)) {
-        // TODO: remove this branch once all clients fixed their tests
-        auto toErase = std::remove_if(userArgs.begin(), userArgs.end(),
-             [](const auto& Item) { return std::strcmp(Item, "-cmc") == 0; });
-        userArgs.erase(toErase, userArgs.end());
-    } else {
-        IGC_ASSERT(!userArgs.empty() && strcmp(userArgs[0], "-cmc") == 0);
-        userArgs.erase(userArgs.begin());
-    }
+    auto toErase = std::remove_if(userArgs.begin(), userArgs.end(),
+        [](const auto& Item) { return std::strcmp(Item, "-cmc") == 0; });
+    userArgs.erase(toErase, userArgs.end());
 
     // this was old hack before FE can pass platform, now we prefer to use argument
     // but if it is null, it may be still useful, so let it be for a while

IGC/AdaptorOCL/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.h

@@ -29,9 +29,7 @@ IN THE SOFTWARE.
 #include <map>
 #include <memory>
 #include <mutex>
-#include <regex>
 #include <utility>
-#include <cstdlib>
 
 #include "cif/builtins/memory/buffer/impl/buffer_impl.h"
 #include "cif/export/pimpl_base.h"
@@ -51,8 +49,6 @@ namespace TC{
 
 namespace IGC {
 
-static constexpr const char* UseLegacyCMCPrefixEnv = "IGC_USE_LEGACY_CMC_PREFIX";
-
 CIF_DECLARE_INTERFACE_PIMPL(FclOclTranslationCtx) : CIF::PimplBase
 {
     CIF_PIMPL_DECLARE_CONSTRUCTOR(CIF::Version_t version, CIF_PIMPL(FclOclDeviceCtx) *globalState,
@@ -113,19 +109,7 @@ CIF_DECLARE_INTERFACE_PIMPL(FclOclTranslationCtx) : CIF::PimplBase
                                         CIF::Builtins::BufferSimple *tracingOptions,
                                         uint32_t tracingOptionsCount
                                         ) {
-        auto needsCMFE = [](const char *optStart, size_t size) {
-            if (!optStart)
-                return false;
-
-            // TODO: remove this once all clients fixed their tests
-            if (std::getenv(UseLegacyCMCPrefixEnv)) {
-                return strstr(optStart, "-cmc") != nullptr;
-            }
-            // "-cmc" should be present as the first argument to invoke CM frontend
-            return std::regex_match(optStart, optStart + size,
-                                    std::regex("^\\s*-cmc(($)|(\\s+.*))"));
-        };
-        if (options != nullptr && needsCMFE(options->GetMemory<char>(), options->GetSizeRaw())) {
+        if ((options != nullptr) && (options->GetSizeRaw() > 0) && (strstr(options->GetMemory<char>(), "-cmc"))) {
             assert(this->outType == CodeType::spirV);
             return TranslateCM(outVersion, src, options, internalOptions, tracingOptions, tracingOptionsCount);
         }