Improved and simplify file and class naming for the code generation step

diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt
index 14b7a3b..614ccff 100644 (file)
--- a/backend/src/CMakeLists.txt
+++ b/backend/src/CMakeLists.txt
@@ -42,16 +42,17 @@ else (GBE_USE_BLOB)
     ir/function.hpp
     ir/value.cpp
     ir/value.hpp
-    backend/gbe_program.cpp
-    backend/gbe_program.h
-    backend/gen/program.cpp
-    backend/gen/program.hpp
-    backend/gen/program.h
+    backend/program.cpp
+    backend/program.h
+    backend/sim_program.cpp
+    backend/sim_program.hpp
+    backend/sim_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)
+    backend/gen/brw_eu.c)
 
   if (GBE_COMPILE_UTESTS)
     set (GBE_SRC

diff --git a/backend/src/backend/gen/program.cpp b/backend/src/backend/gen_program.cpp
similarity index 95%
rename from backend/src/backend/gen/program.cpp
rename to backend/src/backend/gen_program.cpp
index 100be30..c7db99a 100644 (file)
--- a/backend/src/backend/gen/program.cpp
+++ b/backend/src/backend/gen_program.cpp
@@ -22,10 +22,10 @@
  * \author Benjamin Segovia <benjamin.segovia@intel.com>
  */
 
-#include "backend/gbe_program.h"
-#include "backend/gen/program.h"
-#include "backend/gen/program.hpp"
-#include "backend/gen/program.hpp"
+#include "backend/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"

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

diff --git a/backend/src/backend/gen/program.hpp b/backend/src/backend/gen_program.hpp
similarity index 96%
rename from backend/src/backend/gen/program.hpp
rename to backend/src/backend/gen_program.hpp
index 303d24c..653b5b2 100644 (file)
--- a/backend/src/backend/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 "backend/gbe_program.h"
-#include "backend/gbe_program.hpp"
+#include "backend/program.h"
+#include "backend/program.hpp"
 #include "backend/gen/brw_structs.h"
 
 namespace gbe {

diff --git a/backend/src/backend/gbe_program.cpp b/backend/src/backend/program.cpp
similarity index 98%
rename from backend/src/backend/gbe_program.cpp
rename to backend/src/backend/program.cpp
index acd9361..390bf7b 100644 (file)
--- a/backend/src/backend/gbe_program.cpp
+++ b/backend/src/backend/program.cpp
@@ -22,10 +22,10 @@
  * \author Benjamin Segovia <benjamin.segovia@intel.com>
  */
 
-#include "gbe_program.h"
-#include "gbe_program.hpp"
-#include "gen/program.h"
-#include "sim/program.h"
+#include "program.h"
+#include "program.hpp"
+#include "gen_program.h"
+#include "sim_program.h"
 #include "sys/platform.hpp"
 #include "ir/liveness.hpp"
 #include "ir/value.hpp"

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

diff --git a/backend/src/backend/gbe_program.hpp b/backend/src/backend/program.hpp
similarity index 99%
rename from backend/src/backend/gbe_program.hpp
rename to backend/src/backend/program.hpp
index 390d80f..f5f1ddf 100644 (file)
--- a/backend/src/backend/gbe_program.hpp
+++ b/backend/src/backend/program.hpp
@@ -25,7 +25,7 @@
 #ifndef __GBE_PROGRAM_HPP__
 #define __GBE_PROGRAM_HPP__
 
-#include "backend/gbe_program.h"
+#include "backend/program.h"
 #include "sys/hash_map.hpp"
 #include <string>
 

diff --git a/backend/src/backend/sim/program.cpp b/backend/src/backend/sim_program.cpp
similarity index 97%
rename from backend/src/backend/sim/program.cpp
rename to backend/src/backend/sim_program.cpp
index 23e9cc8..cbd5503 100644 (file)
--- a/backend/src/backend/sim/program.cpp
+++ b/backend/src/backend/sim_program.cpp
@@ -22,9 +22,9 @@
  * \author Benjamin Segovia <benjamin.segovia@intel.com>
  */
 
-#include "backend/gbe_program.h"
-#include "backend/sim/program.h"
-#include "backend/sim/program.hpp"
+#include "backend/program.h"
+#include "backend/sim_program.h"
+#include "backend/sim_program.hpp"
 #include <cstring>
 #include <cstdio>
 #include <fstream>

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

diff --git a/backend/src/backend/sim/program.hpp b/backend/src/backend/sim_program.hpp
similarity index 96%
rename from backend/src/backend/sim/program.hpp
rename to backend/src/backend/sim_program.hpp
index 2b792e1..a31877c 100644 (file)
--- a/backend/src/backend/sim/program.hpp
+++ b/backend/src/backend/sim_program.hpp
@@ -25,8 +25,8 @@
 #ifndef __GBE_SIM_PROGRAM_HPP__
 #define __GBE_SIM_PROGRAM_HPP__
 
-#include "backend/gbe_program.h"
-#include "backend/gbe_program.hpp"
+#include "backend/program.h"
+#include "backend/program.hpp"
 #include "backend/gen/brw_structs.h"
 
 namespace gbe {