Put sim and gen files into a common sub-directory

diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt
index 52a9e85..9816930 100644 (file)
--- a/backend/src/CMakeLists.txt
+++ b/backend/src/CMakeLists.txt
@@ -23,8 +23,6 @@ else (GBE_USE_BLOB)
     sys/condition.hpp
     sys/platform.cpp
     sys/platform.hpp
-    gbe_program.cpp
-    gbe_program.h
     ir/context.cpp
     ir/context.hpp
     ir/profile.cpp
@@ -44,14 +42,16 @@ else (GBE_USE_BLOB)
     ir/function.hpp
     ir/value.cpp
     ir/value.hpp
-    gen/program.cpp
-    gen/program.hpp
-    gen/program.h
-    gen/brw_disasm.c
-    gen/brw_eu_emit.c
-    gen/brw_eu.c
-    sim/program.cpp
-    sim/program.h)
+    backend/gbe_program.cpp
+    backend/gbe_program.h
+    backend/gen/program.cpp
+    backend/gen/program.hpp
+    backend/gen/program.h
+    backend/gen/brw_disasm.c
+    backend/gen/brw_eu_emit.c
+    backend/gen/brw_eu.c
+    backend/sim/program.cpp
+    backend/sim/program.h)
 
   if (GBE_COMPILE_UTESTS)
     set (GBE_SRC

diff --git a/backend/src/gbe_program.cpp b/backend/src/backend/gbe_program.cpp
similarity index 100%
rename from backend/src/gbe_program.cpp
rename to backend/src/backend/gbe_program.cpp

diff --git a/backend/src/gbe_program.h b/backend/src/backend/gbe_program.h
similarity index 100%
rename from backend/src/gbe_program.h
rename to backend/src/backend/gbe_program.h

diff --git a/backend/src/gen/brw_chipset.h b/backend/src/backend/gen/brw_chipset.h
similarity index 100%
rename from backend/src/gen/brw_chipset.h
rename to backend/src/backend/gen/brw_chipset.h

diff --git a/backend/src/gen/brw_defines.h b/backend/src/backend/gen/brw_defines.h
similarity index 100%
rename from backend/src/gen/brw_defines.h
rename to backend/src/backend/gen/brw_defines.h

diff --git a/backend/src/gen/brw_disasm.c b/backend/src/backend/gen/brw_disasm.c
similarity index 100%
rename from backend/src/gen/brw_disasm.c
rename to backend/src/backend/gen/brw_disasm.c

diff --git a/backend/src/gen/brw_eu.c b/backend/src/backend/gen/brw_eu.c
similarity index 100%
rename from backend/src/gen/brw_eu.c
rename to backend/src/backend/gen/brw_eu.c

diff --git a/backend/src/gen/brw_eu.h b/backend/src/backend/gen/brw_eu.h
similarity index 100%
rename from backend/src/gen/brw_eu.h
rename to backend/src/backend/gen/brw_eu.h

diff --git a/backend/src/gen/brw_eu_debug.c b/backend/src/backend/gen/brw_eu_debug.c
similarity index 100%
rename from backend/src/gen/brw_eu_debug.c
rename to backend/src/backend/gen/brw_eu_debug.c

diff --git a/backend/src/gen/brw_eu_emit.c b/backend/src/backend/gen/brw_eu_emit.c
similarity index 100%
rename from backend/src/gen/brw_eu_emit.c
rename to backend/src/backend/gen/brw_eu_emit.c

diff --git a/backend/src/gen/brw_eu_util.c b/backend/src/backend/gen/brw_eu_util.c
similarity index 100%
rename from backend/src/gen/brw_eu_util.c
rename to backend/src/backend/gen/brw_eu_util.c

diff --git a/backend/src/gen/brw_structs.h b/backend/src/backend/gen/brw_structs.h
similarity index 100%
rename from backend/src/gen/brw_structs.h
rename to backend/src/backend/gen/brw_structs.h

diff --git a/backend/src/gen/program.cpp b/backend/src/backend/gen/program.cpp
similarity index 97%
rename from backend/src/gen/program.cpp
rename to backend/src/backend/gen/program.cpp
index 113dba0..f79dde5 100644 (file)
--- a/backend/src/gen/program.cpp
+++ b/backend/src/backend/gen/program.cpp
@@ -22,11 +22,11 @@
  * \author Benjamin Segovia <benjamin.segovia@intel.com>
  */
 
-#include "program.h"
-#include "gen/program.h"
-#include "gen/program.hpp"
-#include "gen/program.hpp"
-#include "gen/brw_eu.h"
+#include "backend/gbe_program.h"
+#include "backend/gen/program.h"
+#include "backend/gen/program.hpp"
+#include "backend/gen/program.hpp"
+#include "backend/gen/brw_eu.h"
 #include "ir/liveness.hpp"
 #include "ir/value.hpp"
 #include "ir/unit.hpp"

diff --git a/backend/src/gen/program.h b/backend/src/backend/gen/program.h
similarity index 100%
rename from backend/src/gen/program.h
rename to backend/src/backend/gen/program.h

diff --git a/backend/src/gen/program.hpp b/backend/src/backend/gen/program.hpp
similarity index 98%
rename from backend/src/gen/program.hpp
rename to backend/src/backend/gen/program.hpp
index ca1d841..0545f1f 100644 (file)
--- a/backend/src/gen/program.hpp
+++ b/backend/src/backend/gen/program.hpp
@@ -25,8 +25,8 @@
 #ifndef __GBE_GEN_PROGRAM_HPP__
 #define __GBE_GEN_PROGRAM_HPP__
 
-#include "gbe_program.h"
-#include "gen/brw_structs.h"
+#include "backend/gbe_program.h"
+#include "backend/gen/brw_structs.h"
 #include "sys/hash_map.hpp"
 #include <string>
 

diff --git a/backend/src/sim/program.cpp b/backend/src/backend/sim/program.cpp
similarity index 96%
rename from backend/src/sim/program.cpp
rename to backend/src/backend/sim/program.cpp
index c71e5be..d8d1563 100644 (file)
--- a/backend/src/sim/program.cpp
+++ b/backend/src/backend/sim/program.cpp
@@ -22,8 +22,8 @@
  * \author Benjamin Segovia <benjamin.segovia@intel.com>
  */
 
-#include "gbe_program.h"
-#include "sim/program.h"
+#include "backend/gbe_program.h"
+#include "backend/sim/program.h"
 
 namespace gbe {
 namespace sim {

diff --git a/backend/src/sim/program.h b/backend/src/backend/sim/program.h
similarity index 100%
rename from backend/src/sim/program.h
rename to backend/src/backend/sim/program.h