KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Remove the old brw_optimize() code. 

This is now done in the VS backend before instruction emit.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2012-11-30 18:30:40 -08:00
parent 4fee05b020
commit 4ee892ee8a
3 changed files with 0 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/Makefile.sources
View File

@ -68,7 +68,6 @@ i965_FILES = \
brw_gs_state.c \
brw_lower_texture_gradients.cpp \
brw_misc_state.c \
brw_optimize.c \
brw_program.c \
brw_primitive_restart.c \
brw_queryobj.c \

5
src/mesa/drivers/dri/i965/brw_eu.h
View File

@ -399,11 +399,6 @@ void brw_debug_compact_uncompact(struct intel_context *intel,
struct brw_instruction *orig,
struct brw_instruction *uncompacted);
/* brw_optimize.c */
void brw_optimize(struct brw_compile *p);
void brw_remove_duplicate_mrf_moves(struct brw_compile *p);
void brw_remove_grf_to_mrf_moves(struct brw_compile *p);
#ifdef __cplusplus
}
#endif

114
src/mesa/drivers/dri/i965/brw_optimize.c
View File

@ -1,114 +0,0 @@
/*
* Copyright © 2010 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Authors:
* Eric Anholt <eric@anholt.net>
*
*/
#include "main/macros.h"
#include "program/program.h"
#include "program/prog_print.h"
#include "brw_context.h"
#include "brw_defines.h"
#include "brw_eu.h"
static bool
is_single_channel_dp4(struct brw_instruction *insn)
{
if (insn->header.opcode != BRW_OPCODE_DP4 ||
insn->header.execution_size != BRW_EXECUTE_8 ||
insn->header.access_mode != BRW_ALIGN_16 ||
insn->bits1.da1.dest_reg_file != BRW_GENERAL_REGISTER_FILE)
return false;
if (!is_power_of_two(insn->bits1.da16.dest_writemask))
return false;
return true;
}
/**
* Sets the dependency control fields on DP4 instructions.
*
* The hardware only tracks dependencies on a register basis, so when
* you do:
*
* DP4 dst.x src1 src2
* DP4 dst.y src1 src3
* DP4 dst.z src1 src4
* DP4 dst.w src1 src5
*
* It will wait to do the DP4 dst.y until the dst.x is resolved, etc.
* We can examine our instruction stream and set the dependency
* control fields to tell the hardware when to do it.
*
* We may want to extend this to other instructions that are used to
* fill in a channel at a time of the destination register.
*/
static void
brw_set_dp4_dependency_control(struct brw_compile *p)
{
int i;
for (i = 1; i < p->nr_insn; i++) {
struct brw_instruction *insn = &p->store[i];
struct brw_instruction *prev = &p->store[i - 1];
if (!is_single_channel_dp4(prev))
continue;
if (!is_single_channel_dp4(insn)) {
i++;
continue;
}
/* Only avoid hw dep control if the write masks are different
* channels of one reg.
*/
if (insn->bits1.da16.dest_writemask == prev->bits1.da16.dest_writemask)
continue;
if (insn->bits1.da16.dest_reg_nr != prev->bits1.da16.dest_reg_nr)
continue;
/* Check if the second instruction depends on the previous one
* for a src.
*/
if (insn->bits1.da1.src0_reg_file == BRW_GENERAL_REGISTER_FILE &&
(insn->bits2.da1.src0_address_mode != BRW_ADDRESS_DIRECT ||
insn->bits2.da1.src0_reg_nr == insn->bits1.da16.dest_reg_nr))
continue;
if (insn->bits1.da1.src1_reg_file == BRW_GENERAL_REGISTER_FILE &&
(insn->bits3.da1.src1_address_mode != BRW_ADDRESS_DIRECT ||
insn->bits3.da1.src1_reg_nr == insn->bits1.da16.dest_reg_nr))
continue;
prev->header.dependency_control |= BRW_DEPENDENCY_NOTCLEARED;
insn->header.dependency_control |= BRW_DEPENDENCY_NOTCHECKED;
}
}
void
brw_optimize(struct brw_compile *p)
{
brw_set_dp4_dependency_control(p);
}