From 48d990dfc9e5a82ce1d4c69a5cacbd54d71600ca Mon Sep 17 00:00:00 2001
From: "Plewka, Maciej" <maciej.plewka@intel.com>
Date: Fri, 24 Jul 2020 06:13:29 -0700
Subject: [PATCH] Revert "Pass revision ID to ocloc"

This reverts commit 05990b628b4b492ffac3f22181ba8cf581938507.

Change-Id: I7213d5cb75d6e5657410773da8c7ff386c6bbf8a
---
 .../mock/mock_offline_compiler.h              |  1 -
 .../offline_compiler_tests.cpp                | 19 -------------------
 .../source/offline_compiler.cpp               |  4 ----
 .../source/offline_compiler.h                 |  1 -
 4 files changed, 25 deletions(-)

diff --git a/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
index b464221e20..8616ba9d48 100644
--- a/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
+++ b/opencl/test/unit_test/offline_compiler/mock/mock_offline_compiler.h
@@ -23,7 +23,6 @@ class MockOfflineCompiler : public OfflineCompiler {
     using OfflineCompiler::generateOptsSuffix;
     using OfflineCompiler::getHardwareInfo;
     using OfflineCompiler::getStringWithinDelimiters;
-    using OfflineCompiler::hwInfo;
     using OfflineCompiler::igcDeviceCtx;
     using OfflineCompiler::inputFileLlvm;
     using OfflineCompiler::inputFileSpirV;
diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
index 64c2a3448d..b9bd805401 100644
--- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp
@@ -1188,23 +1188,4 @@ TEST(OfflineCompilerTest, givenDeviceSpecificKernelFileWhenCompilerIsInitialized
     EXPECT_EQ(SUCCESS, retVal);
     EXPECT_STREQ("-cl-opt-disable", mockOfflineCompiler->options.c_str());
 }
-
-TEST(OfflineCompilerTest, givenRevisionIdWhenCompilerIsInitializedThenPassItToHwInfo) {
-    auto mockOfflineCompiler = std::unique_ptr<MockOfflineCompiler>(new MockOfflineCompiler());
-    ASSERT_NE(nullptr, mockOfflineCompiler);
-
-    std::vector<std::string> argv = {
-        "ocloc",
-        "-q",
-        "-file",
-        "test_files/copybuffer.cl",
-        "-device",
-        gEnvironment->devicePrefix.c_str(),
-        "-revision_id",
-        "3"};
-
-    int retVal = mockOfflineCompiler->initialize(argv.size(), argv);
-    EXPECT_EQ(SUCCESS, retVal);
-    EXPECT_EQ(mockOfflineCompiler->hwInfo.platform.usRevId, 3);
-}
 } // namespace NEO
diff --git a/shared/offline_compiler/source/offline_compiler.cpp b/shared/offline_compiler/source/offline_compiler.cpp
index 7e8d4411c5..19a982337c 100644
--- a/shared/offline_compiler/source/offline_compiler.cpp
+++ b/shared/offline_compiler/source/offline_compiler.cpp
@@ -238,7 +238,6 @@ int OfflineCompiler::getHardwareInfo(const char *pDeviceName) {
         if (hardwarePrefix[productId] && (0 == strcmp(pDeviceName, hardwarePrefix[productId]))) {
             if (hardwareInfoTable[productId]) {
                 hwInfo = *hardwareInfoTable[productId];
-                hwInfo.platform.usRevId = revisionId;
                 hardwareInfoSetup[hwInfo.platform.eProductFamily](&hwInfo, true, 0x0);
                 familyNameWithType.clear();
                 familyNameWithType.append(familyName[hwInfo.platform.eRenderCoreFamily]);
@@ -525,9 +524,6 @@ int OfflineCompiler::parseCommandLine(size_t numArgs, const std::vector<std::str
         } else if ("--help" == currArg) {
             printUsage();
             retVal = PRINT_USAGE;
-        } else if (("-revision_id" == currArg) && hasMoreArgs) {
-            revisionId = std::stoi(argv[argIndex + 1]);
-            argIndex++;
         } else {
             argHelper->printf("Invalid option (arg %d): %s\n", argIndex, argv[argIndex].c_str());
             retVal = INVALID_COMMAND_LINE;
diff --git a/shared/offline_compiler/source/offline_compiler.h b/shared/offline_compiler/source/offline_compiler.h
index dfdfab2a9a..8cbc58e016 100644
--- a/shared/offline_compiler/source/offline_compiler.h
+++ b/shared/offline_compiler/source/offline_compiler.h
@@ -137,7 +137,6 @@ class OfflineCompiler {
     std::unique_ptr<OsLibrary> igcLib = nullptr;
     CIF::RAII::UPtr_t<CIF::CIFMain> igcMain = nullptr;
     CIF::RAII::UPtr_t<IGC::IgcOclDeviceCtxTagOCL> igcDeviceCtx = nullptr;
-    int revisionId = REVISION_A0;
 
     std::unique_ptr<OsLibrary> fclLib = nullptr;
     CIF::RAII::UPtr_t<CIF::CIFMain> fclMain = nullptr;