[Autobackout][FunctionalRegression]Revert of change: 56fd8f1: [LLVM16] Adjusting InternalOptions/ApiOptions to newer LLVM

Porting IGC code to LLVM16

    * Adjusting InternalOptions/ApiOptions to newer LLVM

Author: sys-igc

IGC/Options/src/Options.cpp

@@ -7,18 +7,18 @@ SPDX-License-Identifier: MIT
 ============================= end_copyright_notice ===========================*/
 
 #include "igc/Options/Options.h"
+
 #include <llvm/Option/Option.h>
-#include <llvmWrapper/Option/OptTable.h>
 
 using namespace IGC::options;
 using namespace llvm::opt;
 using llvm::raw_ostream;
 
-#define PREFIX(NAME, VALUE) static IGCLLVM::OptPrefixUnionTy API_##NAME = VALUE;
+#define PREFIX(NAME, VALUE) static const char *const API_##NAME[] = VALUE;
 #include "igc/Options/ApiOptions.inc"
 #undef PREFIX
 
-#define PREFIX(NAME, VALUE) static IGCLLVM::OptPrefixUnionTy INTERNAL_##NAME = VALUE;
+#define PREFIX(NAME, VALUE) static const char *const INTERNAL_##NAME[] = VALUE;
 #include "igc/Options/InternalOptions.inc"
 #undef PREFIX
 
@@ -52,9 +52,9 @@ static const OptTable::Info InternalInfoTable[] = {
 };
 
 namespace {
-class IGCApiOptTable : public IGCLLVM::GenericOptTable {
+class IGCApiOptTable : public OptTable {
 public:
-  IGCApiOptTable() : IGCLLVM::GenericOptTable(ApiInfoTable) {
+  IGCApiOptTable() : OptTable(ApiInfoTable) {
     OptTable &Opt = *this;
     (void)Opt;
 #define OPTTABLE_ARG_INIT
@@ -63,9 +63,9 @@ class IGCApiOptTable : public IGCLLVM::GenericOptTable {
   }
 };
 
-class IGCInternalOptTable : public IGCLLVM::GenericOptTable {
+class IGCInternalOptTable : public OptTable {
 public:
-  IGCInternalOptTable() : IGCLLVM::GenericOptTable(InternalInfoTable) {
+  IGCInternalOptTable() : OptTable(InternalInfoTable) {
     OptTable &Opt = *this;
     (void)Opt;
 #define OPTTABLE_ARG_INIT

IGC/WrapperLLVM/include/llvmWrapper/Option/OptTable.h

@@ -12,24 +12,8 @@ SPDX-License-Identifier: MIT
 #include "llvm/Config/llvm-config.h"
 #include "llvm/Option/OptTable.h"
 #include "llvm/Support/raw_ostream.h"
-#include <llvm/ADT/ArrayRef.h>
 
 namespace IGCLLVM {
-
-  using GenericOptTable =
-#if LLVM_VERSION_MAJOR >= 16
-    llvm::opt::GenericOptTable;
-#else // LLVM_VERSION_MAJOR
-    llvm::opt::OptTable;
-#endif // LLVM_VERSION_MAJOR
-
-using OptPrefixUnionTy =
-#if LLVM_VERSION_MAJOR >= 16
-    llvm::ArrayRef<llvm::StringLiteral>;
-#else // LLVM_VERSION_MAJOR
-    const char* const [];
-#endif // LLVM_VERSION_MAJOR
-
 inline void printHelp(const llvm::opt::OptTable &Options, llvm::raw_ostream &OS,
                       const char *Usage, const char *Title,
                       unsigned FlagsToInclude, unsigned FlagsToExclude,