[Mesa-dev] [PATCH 25/32] swr: [rasterizer scripts] Put codegen scripts into a separate directory

[Tim Rowley]

---
 src/gallium/drivers/swr/.gitignore                 |   4 +-
 src/gallium/drivers/swr/Makefile.am                | 126 ++++++++++-----------
 src/gallium/drivers/swr/SConscript                 |  38 +++----
 .../{scripts => codegen}/gen_archrast.py           |   0
 .../{scripts => codegen}/gen_backends.py           |   0
 .../rasterizer/{scripts => codegen}/gen_knobs.py   |   0
 .../scripts => codegen}/gen_llvm_ir_macros.py      |   0
 .../{jitter/scripts => codegen}/gen_llvm_types.py  |   0
 .../rasterizer/{scripts => codegen}/knob_defs.py   |   0
 .../{scripts => codegen}/mako/__init__.py          |   0
 .../{scripts => codegen}/mako/_ast_util.py         |   0
 .../rasterizer/{scripts => codegen}/mako/ast.py    |   0
 .../rasterizer/{scripts => codegen}/mako/cache.py  |   0
 .../rasterizer/{scripts => codegen}/mako/cmd.py    |   0
 .../{scripts => codegen}/mako/codegen.py           |   0
 .../rasterizer/{scripts => codegen}/mako/compat.py |   0
 .../{scripts => codegen}/mako/exceptions.py        |   0
 .../{scripts => codegen}/mako/filters.py           |   0
 .../rasterizer/{scripts => codegen}/mako/lexer.py  |   0
 .../rasterizer/{scripts => codegen}/mako/lookup.py |   0
 .../{scripts => codegen}/mako/parsetree.py         |   0
 .../rasterizer/{scripts => codegen}/mako/pygen.py  |   0
 .../{scripts => codegen}/mako/pyparser.py          |   0
 .../{scripts => codegen}/mako/runtime.py           |   0
 .../{scripts => codegen}/mako/template.py          |   0
 .../rasterizer/{scripts => codegen}/mako/util.py   |   0
 .../templates/ar_event_cpp.template                |   0
 .../templates/ar_event_h.template                  |   0
 .../templates/ar_eventhandler_h.template           |   0
 .../templates/ar_eventhandlerfile_h.template       |   0
 .../templates/backend_template.cpp                 |   0
 .../{scripts => codegen}/templates/knobs.template  |   0
 32 files changed, 84 insertions(+), 84 deletions(-)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/gen_archrast.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/gen_backends.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/gen_knobs.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{jitter/scripts => codegen}/gen_llvm_ir_macros.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{jitter/scripts => codegen}/gen_llvm_types.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/knob_defs.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/__init__.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/_ast_util.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/ast.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/cache.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/cmd.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/codegen.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/compat.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/exceptions.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/filters.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/lexer.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/lookup.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/parsetree.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/pygen.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/pyparser.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/runtime.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/template.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/mako/util.py (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/templates/ar_event_cpp.template (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/templates/ar_event_h.template (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/templates/ar_eventhandler_h.template (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/templates/ar_eventhandlerfile_h.template (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/templates/backend_template.cpp (100%)
 rename src/gallium/drivers/swr/rasterizer/{scripts => codegen}/templates/knobs.template (100%)

diff --git a/src/gallium/drivers/swr/.gitignore b/src/gallium/drivers/swr/.gitignore
index b6c5faa..ec3b400 100644
--- a/src/gallium/drivers/swr/.gitignore
+++ b/src/gallium/drivers/swr/.gitignore
@@ -8,6 +8,6 @@ rasterizer/jitter/builder_gen.h
 rasterizer/jitter/builder_x86.cpp
 rasterizer/jitter/builder_x86.h
 rasterizer/jitter/state_llvm.h
-rasterizer/scripts/gen_knobs.cpp
-rasterizer/scripts/gen_knobs.h
+rasterizer/codegen/gen_knobs.cpp
+rasterizer/codegen/gen_knobs.h
 rasterizer/core/BackendPixelRate0.cpp
diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index c67eadc..e5cf6f2 100644
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -33,12 +33,12 @@ COMMON_CXXFLAGS = \
 	$(GALLIUM_DRIVER_CFLAGS) \
 	$(LLVM_CXXFLAGS) \
 	$(SWR_CXX11_CXXFLAGS) \
-	-I$(builddir)/rasterizer/scripts \
+	-I$(builddir)/rasterizer/codegen \
 	-I$(builddir)/rasterizer/jitter \
 	-I$(builddir)/rasterizer/archrast \
 	-I$(srcdir)/rasterizer \
 	-I$(srcdir)/rasterizer/core \
-	-I$(srcdir)/rasterizer/scripts \
+	-I$(srcdir)/rasterizer/codegen \
 	-I$(srcdir)/rasterizer/jitter \
 	-I$(srcdir)/rasterizer/archrast
 
@@ -53,8 +53,8 @@ COMMON_SOURCES = \
 
 BUILT_SOURCES = \
 	swr_context_llvm.h \
-	rasterizer/scripts/gen_knobs.cpp \
-	rasterizer/scripts/gen_knobs.h \
+	rasterizer/codegen/gen_knobs.cpp \
+	rasterizer/codegen/gen_knobs.h \
 	rasterizer/jitter/state_llvm.h \
 	rasterizer/jitter/builder_x86.h \
 	rasterizer/jitter/builder_x86.cpp \
@@ -66,93 +66,93 @@ BUILT_SOURCES = \
 
 MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
-swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h
+swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py swr_context.h
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
+		$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
 		--input $(srcdir)/swr_context.h \
 		--output swr_context_llvm.h
 
-rasterizer/scripts/gen_knobs.cpp: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
+rasterizer/codegen/gen_knobs.cpp: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/knobs.template
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/scripts/gen_knobs.py \
-		--input $(srcdir)/rasterizer/scripts/templates/knobs.template \
-		--output rasterizer/scripts/gen_knobs.cpp \
+		$(srcdir)/rasterizer/codegen/gen_knobs.py \
+		--input $(srcdir)/rasterizer/codegen/templates/knobs.template \
+		--output rasterizer/codegen/gen_knobs.cpp \
 		--gen_cpp
 
-rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template
+rasterizer/codegen/gen_knobs.h: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/knobs.template
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/scripts/gen_knobs.py \
-		--input $(srcdir)/rasterizer/scripts/templates/knobs.template \
-		--output rasterizer/scripts/gen_knobs.h \
+		$(srcdir)/rasterizer/codegen/gen_knobs.py \
+		--input $(srcdir)/rasterizer/codegen/templates/knobs.template \
+		--output rasterizer/codegen/gen_knobs.h \
 		--gen_h
 
-rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h
+rasterizer/jitter/state_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/core/state.h
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \
+		$(srcdir)/rasterizer/codegen/gen_llvm_types.py \
 		--input $(srcdir)/rasterizer/core/state.h \
 		--output rasterizer/jitter/state_llvm.h
 
-rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+rasterizer/jitter/builder_gen.h: rasterizer/codegen/gen_llvm_ir_macros.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
+		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
 		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
 		--output rasterizer/jitter/builder_gen.h \
 		--gen_h
 
-rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+rasterizer/jitter/builder_gen.cpp: rasterizer/codegen/gen_llvm_ir_macros.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
+		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
 		--input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \
 		--output rasterizer/jitter/builder_gen.cpp \
 		--gen_cpp
 
-rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+rasterizer/jitter/builder_x86.h: rasterizer/codegen/gen_llvm_ir_macros.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
+		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
 		--output rasterizer/jitter/builder_x86.h \
 		--gen_x86_h
 
-rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py
+rasterizer/jitter/builder_x86.cpp: rasterizer/codegen/gen_llvm_ir_macros.py
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
+		$(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \
 		--output rasterizer/jitter/builder_x86.cpp \
 		--gen_x86_cpp
 
-rasterizer/archrast/gen_ar_event.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_h.template rasterizer/archrast/events.proto
+rasterizer/archrast/gen_ar_event.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_event_h.template rasterizer/archrast/events.proto
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/scripts/gen_archrast.py \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
 		--proto $(srcdir)/rasterizer/archrast/events.proto \
 		--output rasterizer/archrast/gen_ar_event.h \
 		--gen_event_h
 
-rasterizer/archrast/gen_ar_event.cpp: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_cpp.template rasterizer/archrast/events.proto
+rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_event_cpp.template rasterizer/archrast/events.proto
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/scripts/gen_archrast.py \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
 		--proto $(srcdir)/rasterizer/archrast/events.proto \
 		--output rasterizer/archrast/gen_ar_event.cpp \
 		--gen_event_cpp
 
-rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto
+rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/scripts/gen_archrast.py \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
 		--proto $(srcdir)/rasterizer/archrast/events.proto \
 		--output rasterizer/archrast/gen_ar_eventhandler.h \
 		--gen_eventhandler_h
 
-rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto
+rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/scripts/gen_archrast.py \
+		$(srcdir)/rasterizer/codegen/gen_archrast.py \
 		--proto $(srcdir)/rasterizer/archrast/events.proto \
 		--output rasterizer/archrast/gen_ar_eventhandlerfile.h \
 		--gen_eventhandlerfile_h
@@ -163,10 +163,10 @@ rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.p
 # 2 centroid
 # 2 forcedSampleCount
 # 2 canEarlyZ
-rasterizer/core/BackendPixelRate0.cpp: rasterizer/scripts/gen_backends.py rasterizer/scripts/templates/backend_template.cpp
+rasterizer/core/BackendPixelRate0.cpp: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/backend_template.cpp
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) \
-		$(srcdir)/rasterizer/scripts/gen_backends.py \
+		$(srcdir)/rasterizer/codegen/gen_backends.py \
 		--outdir rasterizer/core \
 		--dim 5 2 3 2 2 2 \
 		--split 0 \
@@ -263,32 +263,32 @@ include $(top_srcdir)/install-gallium-links.mk
 EXTRA_DIST = \
 	SConscript \
 	rasterizer/archrast/events.proto \
-	rasterizer/jitter/scripts/gen_llvm_ir_macros.py \
-	rasterizer/jitter/scripts/gen_llvm_types.py \
-	rasterizer/scripts/gen_archrast.py \
-	rasterizer/scripts/gen_backends.py \
-	rasterizer/scripts/gen_knobs.py \
-	rasterizer/scripts/knob_defs.py \
-	rasterizer/scripts/mako/ast.py \
-	rasterizer/scripts/mako/_ast_util.py \
-	rasterizer/scripts/mako/cache.py \
-	rasterizer/scripts/mako/cmd.py \
-	rasterizer/scripts/mako/codegen.py \
-	rasterizer/scripts/mako/compat.py \
-	rasterizer/scripts/mako/exceptions.py \
-	rasterizer/scripts/mako/filters.py \
-	rasterizer/scripts/mako/__init__.py \
-	rasterizer/scripts/mako/lexer.py \
-	rasterizer/scripts/mako/lookup.py \
-	rasterizer/scripts/mako/parsetree.py \
-	rasterizer/scripts/mako/pygen.py \
-	rasterizer/scripts/mako/pyparser.py \
-	rasterizer/scripts/mako/runtime.py \
-	rasterizer/scripts/mako/template.py \
-	rasterizer/scripts/mako/util.py \
-	rasterizer/scripts/templates/knobs.template \
-	rasterizer/scripts/templates/ar_event_h.template \
-	rasterizer/scripts/templates/ar_event_cpp.template \
-	rasterizer/scripts/templates/ar_eventhandler_h.template \
-	rasterizer/scripts/templates/ar_eventhandlerfile_h.template \
-	rasterizer/scripts/templates/backend_template.cpp
+	rasterizer/codegen/gen_llvm_ir_macros.py \
+	rasterizer/codegen/gen_llvm_types.py \
+	rasterizer/codegen/gen_archrast.py \
+	rasterizer/codegen/gen_backends.py \
+	rasterizer/codegen/gen_knobs.py \
+	rasterizer/codegen/knob_defs.py \
+	rasterizer/codegen/mako/ast.py \
+	rasterizer/codegen/mako/_ast_util.py \
+	rasterizer/codegen/mako/cache.py \
+	rasterizer/codegen/mako/cmd.py \
+	rasterizer/codegen/mako/codegen.py \
+	rasterizer/codegen/mako/compat.py \
+	rasterizer/codegen/mako/exceptions.py \
+	rasterizer/codegen/mako/filters.py \
+	rasterizer/codegen/mako/__init__.py \
+	rasterizer/codegen/mako/lexer.py \
+	rasterizer/codegen/mako/lookup.py \
+	rasterizer/codegen/mako/parsetree.py \
+	rasterizer/codegen/mako/pygen.py \
+	rasterizer/codegen/mako/pyparser.py \
+	rasterizer/codegen/mako/runtime.py \
+	rasterizer/codegen/mako/template.py \
+	rasterizer/codegen/mako/util.py \
+	rasterizer/codegen/templates/knobs.template \
+	rasterizer/codegen/templates/ar_event_h.template \
+	rasterizer/codegen/templates/ar_event_cpp.template \
+	rasterizer/codegen/templates/ar_eventhandler_h.template \
+	rasterizer/codegen/templates/ar_eventhandlerfile_h.template \
+	rasterizer/codegen/templates/backend_template.cpp
diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript
index dafeb92..eb20b00 100644
--- a/src/gallium/drivers/swr/SConscript
+++ b/src/gallium/drivers/swr/SConscript
@@ -49,85 +49,85 @@ if not env['msvc'] :
 swrroot = '#src/gallium/drivers/swr/'
 
 env.CodeGenerate(
-    target = 'rasterizer/scripts/gen_knobs.cpp',
-    script = swrroot + 'rasterizer/scripts/gen_knobs.py',
-    source = 'rasterizer/scripts/templates/knobs.template',
+    target = 'rasterizer/codegen/gen_knobs.cpp',
+    script = swrroot + 'rasterizer/codegen/gen_knobs.py',
+    source = 'rasterizer/codegen/templates/knobs.template',
     command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_cpp'
 )
 
 env.CodeGenerate(
-    target = 'rasterizer/scripts/gen_knobs.h',
-    script = swrroot + 'rasterizer/scripts/gen_knobs.py',
-    source = 'rasterizer/scripts/templates/knobs.template',
+    target = 'rasterizer/codegen/gen_knobs.h',
+    script = swrroot + 'rasterizer/codegen/gen_knobs.py',
+    source = 'rasterizer/codegen/templates/knobs.template',
     command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_h'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/jitter/state_llvm.h',
-    script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_types.py',
+    script = swrroot + 'rasterizer/codegen/gen_llvm_types.py',
     source = 'rasterizer/core/state.h',
     command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/jitter/builder_gen.h',
-    script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py',
+    script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py',
     source = os.path.join(llvm_includedir, 'llvm/IR/IRBuilder.h'),
     command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_h'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/jitter/builder_gen.cpp',
-    script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py',
+    script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py',
     source = os.path.join(llvm_includedir, 'llvm/IR/IRBuilder.h'),
     command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_cpp'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/jitter/builder_x86.h',
-    script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py',
+    script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py',
     source = '',
     command = python_cmd + ' $SCRIPT --output $TARGET --gen_x86_h'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/jitter/builder_x86.cpp',
-    script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py',
+    script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py',
     source = '',
     command = python_cmd + ' $SCRIPT --output $TARGET --gen_x86_cpp'
 )
 
 env.CodeGenerate(
     target = 'swr_context_llvm.h',
-    script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_types.py',
+    script = swrroot + 'rasterizer/codegen/gen_llvm_types.py',
     source = 'swr_context.h',
     command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_event.h',
-    script = swrroot + 'rasterizer/scripts/gen_archrast.py',
+    script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
     command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_event_h'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_event.cpp',
-    script = swrroot + 'rasterizer/scripts/gen_archrast.py',
+    script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
     command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_event_cpp'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_eventhandler.h',
-    script = swrroot + 'rasterizer/scripts/gen_archrast.py',
+    script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
     command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_eventhandler_h'
 )
 
 env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_eventhandlerfile.h',
-    script = swrroot + 'rasterizer/scripts/gen_archrast.py',
+    script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
     command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_eventhandlerfile_h'
 )
@@ -140,13 +140,13 @@ env.CodeGenerate(
 # 2 canEarlyZ
 env.CodeGenerate(
     target = 'rasterizer/core/BackendPixelRate0.cpp',
-    script = swrroot + 'rasterizer/scripts/gen_backends.py',
+    script = swrroot + 'rasterizer/codegen/gen_backends.py',
     command = python_cmd + ' $SCRIPT --output rasterizer/core --dim 5 2 3 2 2 2 --split 0 --cpp'
 )
 
 # Auto-generated .cpp files (that need to generate object files)
 built_sources = [
-    'rasterizer/scripts/gen_knobs.cpp',
+    'rasterizer/codegen/gen_knobs.cpp',
     'rasterizer/jitter/builder_gen.cpp',
     'rasterizer/jitter/builder_x86.cpp',
     'rasterizer/archrast/gen_ar_event.cpp',
@@ -168,7 +168,7 @@ env.Prepend(LIBS = [ mesautil, mesa, gallium ])
 env.Prepend(CPPPATH = [
     '.',
     'rasterizer',
-    'rasterizer/scripts',
+    'rasterizer/codegen',
     'rasterizer/core',
     'rasterizer/jitter',
     'rasterizer/archrast',
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/gen_archrast.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_archrast.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/gen_archrast.py
rename to src/gallium/drivers/swr/rasterizer/codegen/gen_archrast.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/gen_backends.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/gen_backends.py
rename to src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/gen_knobs.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/gen_knobs.py
rename to src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.py
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_ir_macros.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_ir_macros.py
rename to src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
diff --git a/src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_types.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_types.py
rename to src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/knob_defs.py b/src/gallium/drivers/swr/rasterizer/codegen/knob_defs.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/knob_defs.py
rename to src/gallium/drivers/swr/rasterizer/codegen/knob_defs.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/__init__.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/__init__.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/__init__.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/__init__.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/_ast_util.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/_ast_util.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/_ast_util.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/_ast_util.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/ast.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/ast.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/ast.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/ast.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/cache.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/cache.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/cache.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/cache.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/cmd.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/cmd.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/cmd.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/cmd.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/codegen.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/codegen.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/codegen.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/codegen.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/compat.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/compat.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/compat.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/compat.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/exceptions.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/exceptions.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/exceptions.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/exceptions.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/filters.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/filters.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/filters.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/filters.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/lexer.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/lexer.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/lexer.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/lexer.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/lookup.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/lookup.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/lookup.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/lookup.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/parsetree.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/parsetree.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/parsetree.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/parsetree.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/pygen.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/pygen.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/pygen.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/pygen.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/pyparser.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/pyparser.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/pyparser.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/pyparser.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/runtime.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/runtime.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/runtime.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/runtime.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/template.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/template.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/template.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/template.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/util.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/util.py
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/mako/util.py
rename to src/gallium/drivers/swr/rasterizer/codegen/mako/util.py
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_cpp.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_cpp.template
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_cpp.template
rename to src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_cpp.template
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_h.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_h.template
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_h.template
rename to src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_h.template
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandler_h.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandler_h.template
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandler_h.template
rename to src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandler_h.template
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandlerfile_h.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandlerfile_h.template
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandlerfile_h.template
rename to src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandlerfile_h.template
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/backend_template.cpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/backend_template.cpp
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/templates/backend_template.cpp
rename to src/gallium/drivers/swr/rasterizer/codegen/templates/backend_template.cpp
diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/knobs.template
similarity index 100%
rename from src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template
rename to src/gallium/drivers/swr/rasterizer/codegen/templates/knobs.template
-- 
2.7.4