Merge branch 'llvm-cliptest-viewport'

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

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.h b/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.h
index c9856affe88dd804e6764b6f27d46642d1572fe9..7de6b98f763c45fd0fa1b0afcbe3e8f1a224619d 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_dataflow.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Nicolai Haehnle.
+ * Copyright 2010 Tom Stellard <tstellar@gmail.com>
  *
  * All Rights Reserved.
  *
@@ -33,81 +34,77 @@
 struct radeon_compiler;
 struct rc_instruction;
 struct rc_swizzle_caps;
+struct rc_src_register;
+struct rc_pair_instruction_arg;
+struct rc_compiler;
 
-struct rc_dataflow_vector;
 
-struct rc_dataflow_ref {
-       struct rc_dataflow_vector * Vector;
-
-       /**
-        * Linked list of references to the above-mentioned vector.
-        * The linked list is \em not sorted.
-        */
-       /*@{*/
-       struct rc_dataflow_ref * Prev;
-       struct rc_dataflow_ref * Next;
-       /*@}*/
-
-       unsigned int UseMask:4;
-       struct rc_instruction * ReadInstruction;
-};
+/**
+ * Help analyze and modify the register accesses of instructions.
+ */
+/*@{*/
+typedef void (*rc_read_write_chan_fn)(void * userdata, struct rc_instruction * inst,
+                       rc_register_file file, unsigned int index, unsigned int chan);
+void rc_for_all_reads_chan(struct rc_instruction * inst, rc_read_write_chan_fn cb, void * userdata);
+void rc_for_all_writes_chan(struct rc_instruction * inst, rc_read_write_chan_fn cb, void * userdata);
+
+typedef void (*rc_read_write_mask_fn)(void * userdata, struct rc_instruction * inst,
+                       rc_register_file file, unsigned int index, unsigned int mask);
+void rc_for_all_reads_mask(struct rc_instruction * inst, rc_read_write_mask_fn cb, void * userdata);
+void rc_for_all_writes_mask(struct rc_instruction * inst, rc_read_write_mask_fn cb, void * userdata);
+
+typedef void (*rc_read_src_fn)(void * userdata, struct rc_instruction * inst,
+                       struct rc_src_register * src);
+void rc_for_all_reads_src(struct rc_instruction * inst, rc_read_src_fn cb,
+                       void * userdata);
+
+typedef void (*rc_pair_read_arg_fn)(void * userdata,
+       struct rc_instruction * inst, struct rc_pair_instruction_arg * arg);
+void rc_pair_for_all_reads_arg(struct rc_instruction * inst,
+                                       rc_pair_read_arg_fn cb, void * userdata);
+
+typedef void (*rc_remap_register_fn)(void * userdata, struct rc_instruction * inst,
+                       rc_register_file * pfile, unsigned int * pindex);
+void rc_remap_registers(struct rc_instruction * inst, rc_remap_register_fn cb, void * userdata);
+/*@}*/
 
-struct rc_dataflow_vector {
-       rc_register_file File:3;
-       unsigned int Index:RC_REGISTER_INDEX_BITS;
-
-       /** For private use in compiler passes. MUST BE RESET TO 0 by the end of each pass.
-        * The annotate pass uses this bit to track whether a vector is in the
-        * update stack.
-        */
-       unsigned int PassBit:1;
-       /** Which of the components have been written with useful values */
-       unsigned int ValidMask:4;
-       /** Which of the components are used downstream */
-       unsigned int UseMask:4;
-       /** The instruction that produced this vector */
-       struct rc_instruction * WriteInstruction;
-
-       /** Linked list of references to this vector */
-       struct rc_dataflow_ref Refs;
+struct rc_reader {
+       struct rc_instruction * Inst;
+       unsigned int WriteMask;
+       struct rc_src_register * Src;
 };
 
-struct rc_instruction_dataflow {
-       struct rc_dataflow_ref * SrcReg[3];
-       struct rc_dataflow_ref * SrcRegAddress[3];
-
-       /** Reference the components of the destination register
-        * that are carried over without being overwritten */
-       struct rc_dataflow_ref * DstRegPrev;
-       /** Indicates whether the destination register was in use
-        * before this instruction */
-       unsigned int DstRegAliased:1;
-       struct rc_dataflow_vector * DstReg;
-};
+struct rc_reader_data {
+       unsigned int Abort;
+       unsigned int AbortOnRead;
+       unsigned int InElse;
+       struct rc_instruction * Writer;
 
-/**
- * General functions for manipulating the dataflow structures.
- */
-/*@{*/
-struct rc_dataflow_ref * rc_dataflow_create_ref(struct radeon_compiler * c,
-               struct rc_dataflow_vector * vector, struct rc_instruction * inst);
-struct rc_dataflow_vector * rc_dataflow_create_vector(struct radeon_compiler * c,
-               rc_register_file file, unsigned int index, struct rc_instruction * inst);
-void rc_dataflow_remove_ref(struct rc_dataflow_ref * ref);
+       unsigned int ReaderCount;
+       unsigned int ReadersReserved;
+       struct rc_reader * Readers;
 
-void rc_dataflow_remove_instruction(struct rc_instruction * inst);
-/*@}*/
+       void * CbData;
+};
 
+void rc_get_readers_normal(
+       struct radeon_compiler * c,
+       struct rc_instruction * inst,
+       struct rc_reader_data * data,
+       /*XXX: These should be their own function types. */
+       rc_read_src_fn read_cb,
+       rc_read_write_mask_fn write_cb);
 
 /**
- * Compiler passes based on dataflow structures.
+ * Compiler passes based on dataflow analysis.
  */
 /*@{*/
 typedef void (*rc_dataflow_mark_outputs_fn)(void * userdata, void * data,
                        void (*mark_fn)(void * data, unsigned int index, unsigned int mask));
-void rc_dataflow_annotate(struct radeon_compiler * c, rc_dataflow_mark_outputs_fn dce, void * userdata);
-void rc_dataflow_dealias(struct radeon_compiler * c);
-void rc_dataflow_swizzles(struct radeon_compiler * c);
+void rc_dataflow_deadcode(struct radeon_compiler * c, void *user);
+void rc_dataflow_swizzles(struct radeon_compiler * c, void *user);
 /*@}*/
 
+void rc_optimize(struct radeon_compiler * c, void *user);
+
 #endif /* RADEON_DATAFLOW_H */