--- /dev/null
+/*
+ * Copyright © 2014 Broadcom
+ *
+ * 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.
+ */
+
+/**
+ * @file vc4_opt_coalesce_ff_writes.c
+ *
+ * This modifies instructions that generate the value consumed by a VPM write
+ * to write directly into the VPM.
+ */
+
+#include "vc4_qir.h"
+
+bool
+qir_opt_coalesce_ff_writes(struct vc4_compile *c)
+{
+ if (c->stage == QSTAGE_FRAG)
+ return false;
+
+ /* For now, only do this pass when we don't have control flow. */
+ struct qblock *block = qir_entry_block(c);
+ if (block != qir_exit_block(c))
+ return false;
+
+ bool progress = false;
+ struct qinst *vpm_writes[64] = { 0 };
+ uint32_t use_count[c->num_temps];
+ uint32_t vpm_write_count = 0;
+ memset(&use_count, 0, sizeof(use_count));
+
+ qir_for_each_inst_inorder(inst, c) {
+ switch (inst->dst.file) {
+ case QFILE_VPM:
+ vpm_writes[vpm_write_count++] = inst;
+ break;
+ default:
+ break;
+ }
+
+ for (int i = 0; i < qir_get_nsrc(inst); i++) {
+ if (inst->src[i].file == QFILE_TEMP) {
+ uint32_t temp = inst->src[i].index;
+ use_count[temp]++;
+ }
+ }
+ }
+
+ for (int i = 0; i < vpm_write_count; i++) {
+ if (!qir_is_raw_mov(vpm_writes[i]) ||
+ vpm_writes[i]->src[0].file != QFILE_TEMP) {
+ continue;
+ }
+
+ uint32_t temp = vpm_writes[i]->src[0].index;
+ if (use_count[temp] != 1)
+ continue;
+
+ struct qinst *inst = c->defs[temp];
+ if (!inst)
+ continue;
+
+ if (qir_depends_on_flags(inst) || inst->sf)
+ continue;
+
+ if (qir_has_side_effects(c, inst) ||
+ qir_has_side_effect_reads(c, inst)) {
+ continue;
+ }
+
+ /* Move the generating instruction to the end of the program
+ * to maintain the order of the VPM writes.
+ */
+ assert(!vpm_writes[i]->sf);
+ list_del(&inst->link);
+ list_addtail(&inst->link, &vpm_writes[i]->link);
+ qir_remove_instruction(c, vpm_writes[i]);
+
+ c->defs[inst->dst.index] = NULL;
+ inst->dst.file = QFILE_VPM;
+ inst->dst.index = 0;
+
+ progress = true;
+ }
+
+ return progress;
+}
/**
* @file vc4_opt_vpm.c
*
- * This modifies instructions that:
- * 1. exclusively consume a value read from the VPM to directly read the VPM if
- * other operands allow it.
- * 2. generate the value consumed by a VPM write to write directly into the VPM.
+ * This modifies instructions that exclusively consume a value read from the
+ * VPM to directly read the VPM if other operands allow it.
*/
#include "vc4_qir.h"
return false;
bool progress = false;
- struct qinst *vpm_writes[64] = { 0 };
uint32_t use_count[c->num_temps];
- uint32_t vpm_write_count = 0;
memset(&use_count, 0, sizeof(use_count));
qir_for_each_inst_inorder(inst, c) {
- switch (inst->dst.file) {
- case QFILE_VPM:
- vpm_writes[vpm_write_count++] = inst;
- break;
- default:
- break;
- }
-
for (int i = 0; i < qir_get_nsrc(inst); i++) {
if (inst->src[i].file == QFILE_TEMP) {
uint32_t temp = inst->src[i].index;
}
}
- for (int i = 0; i < vpm_write_count; i++) {
- if (!qir_is_raw_mov(vpm_writes[i]) ||
- vpm_writes[i]->src[0].file != QFILE_TEMP) {
- continue;
- }
-
- uint32_t temp = vpm_writes[i]->src[0].index;
- if (use_count[temp] != 1)
- continue;
-
- struct qinst *inst = c->defs[temp];
- if (!inst)
- continue;
-
- if (qir_depends_on_flags(inst) || inst->sf)
- continue;
-
- if (qir_has_side_effects(c, inst) ||
- qir_has_side_effect_reads(c, inst)) {
- continue;
- }
-
- /* Move the generating instruction to the end of the program
- * to maintain the order of the VPM writes.
- */
- assert(!vpm_writes[i]->sf);
- list_del(&inst->link);
- list_addtail(&inst->link, &vpm_writes[i]->link);
- qir_remove_instruction(c, vpm_writes[i]);
-
- c->defs[inst->dst.index] = NULL;
- inst->dst.file = QFILE_VPM;
- inst->dst.index = 0;
-
- progress = true;
- }
-
return progress;
}
projects / mesa.git / commitdiff