Move VC option parser into separate library

Author: aus-intel

IGC/VectorCompiler/include/vc/CMakeLists.txt

@@ -1 +1 @@
-add_subdirectory(Support)
+add_subdirectory(Options)

IGC/VectorCompiler/include/vc/Support/CMakeLists.txt renamed to IGC/VectorCompiler/include/vc/Options/CMakeLists.txt

@@ -45,7 +45,7 @@ enum ID {
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
                HELPTEXT, METAVAR, VALUES)                                      \
   OPT_##ID,
-#include "vc/Support/Options.inc"
+#include "vc/Options/Options.inc"
   LastOption
 #undef OPTION
 };

IGC/VectorCompiler/include/vc/Support/Options.h renamed to IGC/VectorCompiler/include/vc/Options/Options.h

@@ -1,5 +1,6 @@
 add_subdirectory(GenXOpts)
 add_subdirectory(GenXCodeGen)
+add_subdirectory(Options)
 add_subdirectory(Support)
 
 # Plugin support.

IGC/VectorCompiler/include/vc/Support/Options.td renamed to IGC/VectorCompiler/include/vc/Options/Options.td

@@ -82,6 +82,7 @@ target_link_libraries(VCCodeGen
   LLVMGenXIntrinsics
 
   VCHeaders
+  VCOptions
   VCTransforms
   VCTargetInfo
   VCSupport

IGC/VectorCompiler/lib/CMakeLists.txt

@@ -34,11 +34,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "vc/GenXCodeGen/GenXWrapper.h"
 #include "vc/GenXOpts/GenXOpts.h"
 #include "vc/GenXOpts/Utils/KernelInfo.h"
-#include "vc/Support/Options.h"
+#include "vc/Options/Options.h"
 #include "vc/Support/Status.h"
+#include "llvm/GenXIntrinsics/GenXIntrOpts.h"
 #include "llvm/GenXIntrinsics/GenXIntrinsics.h"
 #include "llvm/GenXIntrinsics/GenXSPIRVReaderAdaptor.h"
-#include "llvm/GenXIntrinsics/GenXIntrOpts.h"
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"

IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt

@@ -0,0 +1,13 @@
+set(SUPPORT_SOURCES
+  Options.cpp
+  )
+
+add_library(VCOptions ${SUPPORT_SOURCES})
+vc_get_llvm_targets(LLVM_LIBS
+  LLVMOption
+  )
+target_link_libraries(VCOptions
+  VCHeaders
+
+  ${LLVM_LIBS}
+  )

IGC/VectorCompiler/lib/GenXCodeGen/GenXWrapper.cpp

@@ -24,23 +24,23 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ======================= end_copyright_notice ==================================*/
 
-#include "vc/Support/Options.h"
+#include "vc/Options/Options.h"
 
 #include <llvm/Option/Option.h>
 
 using namespace vc::options;
 using namespace llvm::opt;
 
 #define PREFIX(NAME, VALUE) static const char *const NAME[] = VALUE;
-#include "vc/Support/Options.inc"
+#include "vc/Options/Options.inc"
 #undef PREFIX
 
 static const OptTable::Info InfoTable[] = {
 #define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
                HELPTEXT, METAVAR, VALUES)                                      \
   {PREFIX, NAME,  HELPTEXT,    METAVAR,     OPT_##ID,  Option::KIND##Class,    \
    PARAM,  FLAGS, OPT_##GROUP, OPT_##ALIAS, ALIASARGS, VALUES},
-#include "vc/Support/Options.inc"
+#include "vc/Options/Options.inc"
 #undef OPTION
 };
 
@@ -51,7 +51,7 @@ class VCOptTable : public OptTable {
     OptTable &Opt = *this;
     (void)Opt;
 #define OPTTABLE_ARG_INIT
-#include "vc/Support/Options.inc"
+#include "vc/Options/Options.inc"
 #undef OPTTABLE_ARG_INIT
   }
 };

IGC/VectorCompiler/lib/Options/CMakeLists.txt

@@ -1,13 +1,11 @@
 set(SUPPORT_SOURCES
   Status.cpp
-  Options.cpp
   ShaderDump.cpp
   )
 
 add_library(VCSupport ${SUPPORT_SOURCES})
 vc_get_llvm_targets(LLVM_LIBS
   LLVMSupport
-  LLVMOption
   )
 target_link_libraries(VCSupport
   VCHeaders