Support Gen6 three-source-operand instructions.

Add bits1.three_src.gen6.dest_reg_file according to Gen6 spec

2 files changed, 20 insertions, 19 deletions

diff --git a/src/brw_structs.h b/src/brw_structs.h
index c01c032..3c0c578 100644
--- a/src/brw_structs.h
+++ b/src/brw_structs.h
@@ -1123,9 +1123,9 @@ struct brw_instruction
 
       struct
       {
-	 GLuint pad0:1; /* reserved */
+	 GLuint dest_reg_file:1; /* used in Gen6, deleted in Gen7 */
 	 GLuint flag_subreg_nr:1;
-	 GLuint flag_reg_nr:1;
+	 GLuint flag_reg_nr:1;   /* not in Gen6. Add in Gen7 */
 	 GLuint pad1:1; /* reserved */
 	 GLuint src0_modifier:2;
 	 GLuint src1_modifier:2;
@@ -1138,7 +1138,7 @@ struct brw_instruction
 	 GLuint dest_writemask:4;
 	 GLuint dest_subreg_nr:3;
 	 GLuint dest_reg_nr:8;
-      } three_src_gen7; /* Three-source-operator instructions for Gen7+ */
+      } three_src_gen6; /* Three-source-operator instructions for Gen6+ */
    } bits1;
 
 
@@ -1219,7 +1219,7 @@ struct brw_instruction
 	 GLuint src1_rep_ctrl:1;
 	 GLuint src1_swizzle:8;
 	 GLuint src1_subreg_nr_low:2; /* src1_subreg_nr spans on two DWORDs */
-      } three_src_gen7; /* Three-source-operator instructions for Gen7+ */
+      } three_src_gen6; /* Three-source-operator instructions for Gen6+ */
 
        struct 
        {
@@ -1305,7 +1305,7 @@ struct brw_instruction
 	 GLuint src2_subreg_nr:3;
 	 GLuint src2_reg_nr:8;
 	 GLuint pad1:2; /* reserved */
-      } three_src_gen7; /* Three-source-operator instructions for Gen7+ */
+      } three_src_gen6; /* Three-source-operator instructions for Gen6+ */
 
       struct
       {
diff --git a/src/gram.y b/src/gram.y
index 65e7f20..4e423b2 100644
--- a/src/gram.y
+++ b/src/gram.y
@@ -773,8 +773,8 @@ trinaryinstruction:
 
 		  $$.header.predicate_control = $1.header.predicate_control;
 		  $$.header.predicate_inverse = $1.header.predicate_inverse;
-		  $$.bits1.three_src_gen7.flag_reg_nr = $1.bits2.da1.flag_reg_nr;
-		  $$.bits1.three_src_gen7.flag_subreg_nr = $1.bits2.da1.flag_subreg_nr;
+		  $$.bits1.three_src_gen6.flag_reg_nr = $1.bits2.da1.flag_reg_nr;
+		  $$.bits1.three_src_gen6.flag_subreg_nr = $1.bits2.da1.flag_subreg_nr;
 
 		  $$.header.opcode = $2;
 		  $$.header.sfid_destreg__conditionalmod = $3.cond;
@@ -3014,10 +3014,11 @@ static int reg_type_2_to_3(int reg_type)
 int set_instruction_dest_three_src(struct brw_instruction *instr,
                                    struct dst_operand *dest)
 {
-	instr->bits1.three_src_gen7.dest_reg_nr = dest->reg_nr;
-	instr->bits1.three_src_gen7.dest_subreg_nr = get_subreg_address(dest->reg_file, dest->reg_type, dest->subreg_nr, dest->address_mode) / 4; // in DWORD
-	instr->bits1.three_src_gen7.dest_writemask = dest->writemask;
-	instr->bits1.three_src_gen7.dest_reg_type = reg_type_2_to_3(dest->reg_type);
+	instr->bits1.three_src_gen6.dest_reg_file = dest->reg_file;
+	instr->bits1.three_src_gen6.dest_reg_nr = dest->reg_nr;
+	instr->bits1.three_src_gen6.dest_subreg_nr = get_subreg_address(dest->reg_file, dest->reg_type, dest->subreg_nr, dest->address_mode) / 4; // in DWORD
+	instr->bits1.three_src_gen6.dest_writemask = dest->writemask;
+	instr->bits1.three_src_gen6.dest_reg_type = reg_type_2_to_3(dest->reg_type);
 	return 0;
 }
 
@@ -3028,9 +3029,9 @@ int set_instruction_src0_three_src(struct brw_instruction *instr,
 		reset_instruction_src_region(instr, src);
 	}
 	// TODO: supporting src0 swizzle, src0 modifier, src0 rep_ctrl
-	instr->bits1.three_src_gen7.src_reg_type = reg_type_2_to_3(src->reg_type);
-	instr->bits2.three_src_gen7.src0_subreg_nr = get_subreg_address(src->reg_file, src->reg_type, src->subreg_nr, src->address_mode) / 4; // in DWORD
-	instr->bits2.three_src_gen7.src0_reg_nr = src->reg_nr;
+	instr->bits1.three_src_gen6.src_reg_type = reg_type_2_to_3(src->reg_type);
+	instr->bits2.three_src_gen6.src0_subreg_nr = get_subreg_address(src->reg_file, src->reg_type, src->subreg_nr, src->address_mode) / 4; // in DWORD
+	instr->bits2.three_src_gen6.src0_reg_nr = src->reg_nr;
 	return 0;
 }
 
@@ -3042,9 +3043,9 @@ int set_instruction_src1_three_src(struct brw_instruction *instr,
 	}
 	// TODO: supporting src1 swizzle, src1 modifier, src1 rep_ctrl
 	int v = get_subreg_address(src->reg_file, src->reg_type, src->subreg_nr, src->address_mode) / 4; // in DWORD
-	instr->bits2.three_src_gen7.src1_subreg_nr_low = v % 4; // lower 2 bits
-	instr->bits3.three_src_gen7.src1_subreg_nr_high = v / 4; // highest bit
-	instr->bits3.three_src_gen7.src1_reg_nr = src->reg_nr;
+	instr->bits2.three_src_gen6.src1_subreg_nr_low = v % 4; // lower 2 bits
+	instr->bits3.three_src_gen6.src1_subreg_nr_high = v / 4; // highest bit
+	instr->bits3.three_src_gen6.src1_reg_nr = src->reg_nr;
 	return 0;
 }
 
@@ -3055,8 +3056,8 @@ int set_instruction_src2_three_src(struct brw_instruction *instr,
 		reset_instruction_src_region(instr, src);
 	}
 	// TODO: supporting src2 swizzle, src2 modifier, src2 rep_ctrl
-	instr->bits3.three_src_gen7.src2_subreg_nr = get_subreg_address(src->reg_file, src->reg_type, src->subreg_nr, src->address_mode) / 4; // in DWORD
-	instr->bits3.three_src_gen7.src2_reg_nr = src->reg_nr;
+	instr->bits3.three_src_gen6.src2_subreg_nr = get_subreg_address(src->reg_file, src->reg_type, src->subreg_nr, src->address_mode) / 4; // in DWORD
+	instr->bits3.three_src_gen6.src2_reg_nr = src->reg_nr;
 	return 0;
 }