Move VC option parser into separate library

aus-intel · igcbot · commit adaeac7e8f3e · 2020-11-20T15:01:43.000+01:00
diff --git a/IGC/VectorCompiler/include/vc/CMakeLists.txt b/IGC/VectorCompiler/include/vc/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(Support)
+add_subdirectory(Options)
diff --git a/IGC/VectorCompiler/include/vc/Options/CMakeLists.txt b/IGC/VectorCompiler/include/vc/Options/CMakeLists.txt
diff --git a/IGC/VectorCompiler/include/vc/Options/Options.h b/IGC/VectorCompiler/include/vc/Options/Options.h
@@ -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
 };
diff --git a/IGC/VectorCompiler/include/vc/Options/Options.td b/IGC/VectorCompiler/include/vc/Options/Options.td
diff --git a/IGC/VectorCompiler/lib/CMakeLists.txt b/IGC/VectorCompiler/lib/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(GenXOpts)
 add_subdirectory(GenXCodeGen)
+add_subdirectory(Options)
 add_subdirectory(Support)
 
 # Plugin support.
diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXCodeGen/CMakeLists.txt
@@ -82,6 +82,7 @@ target_link_libraries(VCCodeGen
   LLVMGenXIntrinsics
 
   VCHeaders
+  VCOptions
   VCTransforms
   VCTargetInfo
   VCSupport
diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXWrapper.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXWrapper.cpp
@@ -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"
diff --git a/IGC/VectorCompiler/lib/Options/CMakeLists.txt b/IGC/VectorCompiler/lib/Options/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}
+  )
diff --git a/IGC/VectorCompiler/lib/Options/Options.cpp b/IGC/VectorCompiler/lib/Options/Options.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
   }
 };
diff --git a/IGC/VectorCompiler/lib/Support/CMakeLists.txt b/IGC/VectorCompiler/lib/Support/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

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-add_subdirectory(Support)`
	`1`	`+add_subdirectory(Options)`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`	`1`	`set(SUPPORT_SOURCES`
`2`	`2`	`Status.cpp`
`3`		`- Options.cpp`
`4`	`3`	`ShaderDump.cpp`
`5`	`4`	`)`
`6`	`5`
`7`	`6`	`add_library(VCSupport ${SUPPORT_SOURCES})`
`8`	`7`	`vc_get_llvm_targets(LLVM_LIBS`
`9`	`8`	`LLVMSupport`
`10`		`- LLVMOption`
`11`	`9`	`)`
`12`	`10`	`target_link_libraries(VCSupport`
`13`	`11`	`VCHeaders`