r300/compiler: Rewrite register allocator

[mesa.git] / src / mesa / drivers / dri / r300 / compiler / radeon_program_pair.h

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h
index 1600598428771162aa3c085465967a15f0a99f63..a957ea9f7a0b81b34577aaccc20928a2bb06a8c0 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h
@@ -32,7 +32,7 @@
 #include "radeon_opcodes.h"
 #include "radeon_program_constants.h"
 
-struct r300_fragment_program_compiler;
+struct radeon_compiler;
 
 
 /**
@@ -49,56 +49,49 @@ struct r300_fragment_program_compiler;
  * see \ref rc_pair_translate
  */
 
+/* For rgb and alpha instructions when arg[n].Source = RC_PAIR_PRESUB_SRC, then
+ * the presubtract value will be used, and
+ * {RGB,Alpha}.Src[RC_PAIR_PRESUB_SRC].File will be set to RC_FILE_PRESUB.
+ */
+#define RC_PAIR_PRESUB_SRC 3
 
-struct radeon_pair_instruction_source {
+struct rc_pair_instruction_source {
        unsigned int Used:1;
-       rc_register_file File:3;
+       unsigned int File:3;
        unsigned int Index:RC_REGISTER_INDEX_BITS;
 };
 
-struct radeon_pair_instruction_rgb {
-       rc_opcode Opcode:8;
-       unsigned int DestIndex:RC_REGISTER_INDEX_BITS;
-       unsigned int WriteMask:3;
-       unsigned int OutputWriteMask:3;
-       unsigned int Saturate:1;
-
-       struct radeon_pair_instruction_source Src[3];
-
-       struct {
-               unsigned int Source:2;
-               unsigned int Swizzle:9;
-               unsigned int Abs:1;
-               unsigned int Negate:1;
-       } Arg[3];
+struct rc_pair_instruction_arg {
+       unsigned int Source:2;
+       unsigned int Swizzle:12;
+       unsigned int Abs:1;
+       unsigned int Negate:1;
 };
 
-struct radeon_pair_instruction_alpha {
-       rc_opcode Opcode:8;
+struct rc_pair_sub_instruction {
+       unsigned int Opcode:8;
        unsigned int DestIndex:RC_REGISTER_INDEX_BITS;
-       unsigned int WriteMask:1;
-       unsigned int OutputWriteMask:1;
+       unsigned int WriteMask:4;
+       unsigned int Target:2;
+       unsigned int OutputWriteMask:3;
        unsigned int DepthWriteMask:1;
        unsigned int Saturate:1;
 
-       struct radeon_pair_instruction_source Src[3];
-
-       struct {
-               unsigned int Source:2;
-               unsigned int Swizzle:3;
-               unsigned int Abs:1;
-               unsigned int Negate:1;
-       } Arg[3];
+       struct rc_pair_instruction_source Src[4];
+       struct rc_pair_instruction_arg Arg[3];
 };
 
 struct rc_pair_instruction {
-       struct radeon_pair_instruction_rgb RGB;
-       struct radeon_pair_instruction_alpha Alpha;
+       struct rc_pair_sub_instruction RGB;
+       struct rc_pair_sub_instruction Alpha;
 
-       rc_write_aluresult WriteALUResult:2;
-       rc_compare_func ALUResultCompare:3;
+       unsigned int WriteALUResult:2;
+       unsigned int ALUResultCompare:3;
+       unsigned int Nop:1;
 };
 
+typedef void (*rc_pair_foreach_src_fn)
+                       (void *, struct rc_pair_instruction_source *);
 
 /**
  * General helper functions for dealing with the paired instruction format.
@@ -107,6 +100,24 @@ struct rc_pair_instruction {
 int rc_pair_alloc_source(struct rc_pair_instruction *pair,
        unsigned int rgb, unsigned int alpha,
        rc_register_file file, unsigned int index);
+
+void rc_pair_foreach_source_that_alpha_reads(
+       struct rc_pair_instruction * pair,
+       void * data,
+       rc_pair_foreach_src_fn cb);
+
+void rc_pair_foreach_source_that_rgb_reads(
+       struct rc_pair_instruction * pair,
+       void * data,
+       rc_pair_foreach_src_fn cb);
+
+struct rc_pair_instruction_source * rc_pair_get_src(
+       struct rc_pair_instruction * pair_inst,
+       struct rc_pair_instruction_arg * arg);
+
+int rc_pair_get_src_index(
+       struct rc_pair_instruction * pair_inst,
+       struct rc_pair_instruction_source * src);
 /*@}*/
 
 
@@ -116,9 +127,11 @@ int rc_pair_alloc_source(struct rc_pair_instruction *pair,
 /*@{*/
 struct radeon_pair_handler;
 
-void rc_pair_translate(struct r300_fragment_program_compiler *c);
-void rc_pair_schedule(struct r300_fragment_program_compiler *c);
-void rc_pair_regalloc(struct r300_fragment_program_compiler *c, unsigned maxtemps);
+void rc_pair_translate(struct radeon_compiler *cc, void *user);
+void rc_pair_schedule(struct radeon_compiler *cc, void *user);
+void rc_pair_regalloc(struct radeon_compiler *cc, void *user);
+void rc_pair_regalloc_inputs_only(struct radeon_compiler *cc, void *user);
+void rc_pair_remove_dead_sources(struct radeon_compiler *c, void *user);
 /*@}*/
 
 #endif /* __RADEON_PROGRAM_PAIR_H_ */