summaryrefslogtreecommitdiff
path: root/src/intel
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2017-06-20 22:38:48 -0700
committerMatt Turner <mattst88@gmail.com>2017-07-20 16:56:49 -0700
commit93dc736f4e5b71fbc99a02dc355e1d77daee415b (patch)
tree29609c74e862a983b0cda1571ace87be043fce27 /src/intel
parent30b72f41267c7359e1809d2874c76effe661049b (diff)
i965/fs: Handle explicit flag destinations in flags_written()
The implementations of the ARB_shader_group_vote intrinsics will explicitly write the flag as the destination register. Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/compiler/brw_fs.cpp23
1 files changed, 19 insertions, 4 deletions
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index ab9e95524c3..f3bb3835d9b 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -857,6 +857,24 @@ namespace {
const unsigned end = start + inst->exec_size;
return ((1 << DIV_ROUND_UP(end, 8)) - 1) & ~((1 << (start / 8)) - 1);
}
+
+ unsigned
+ bit_mask(unsigned n)
+ {
+ return (n >= CHAR_BIT * sizeof(bit_mask(n)) ? ~0u : (1u << n) - 1);
+ }
+
+ unsigned
+ flag_mask(const fs_reg &r, unsigned sz)
+ {
+ if (r.file == ARF) {
+ const unsigned start = (r.nr - BRW_ARF_FLAG) * 4 + r.subnr;
+ const unsigned end = start + sz;
+ return bit_mask(end) & ~bit_mask(start);
+ } else {
+ return 0;
+ }
+ }
}
unsigned
@@ -882,16 +900,13 @@ fs_inst::flags_read(const gen_device_info *devinfo) const
unsigned
fs_inst::flags_written() const
{
- /* XXX - This doesn't consider explicit uses of the flag register as
- * destination region.
- */
if ((conditional_mod && (opcode != BRW_OPCODE_SEL &&
opcode != BRW_OPCODE_IF &&
opcode != BRW_OPCODE_WHILE)) ||
opcode == FS_OPCODE_MOV_DISPATCH_TO_FLAGS) {
return flag_mask(this);
} else {
- return 0;
+ return flag_mask(dst, size_written);
}
}