From: Iago Toral Quiroga <ito...@igalia.com>
Since it no longer handles conversions from double to float but from
double to various other 32-bit types.
---
src/mesa/drivers/dri/i965/Makefile.sources | 2 +-
src/mesa/drivers/dri/i965/brw_fs.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs.h | 2 +-
src/mesa/drivers/dri/i965/brw_fs_lower_d2f.cpp | 75 --------------------------
src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp | 75 ++++++++++++++++++++++++++
5 files changed, 78 insertions(+), 78 deletions(-)
delete mode 100644 src/mesa/drivers/dri/i965/brw_fs_lower_d2f.cpp
create mode 100644 src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources
b/src/mesa/drivers/dri/i965/Makefile.sources
index 47870f2..89aeaa2 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -26,7 +26,7 @@ i965_compiler_FILES = \
brw_fs.h \
brw_fs_live_variables.cpp \
brw_fs_live_variables.h \
- brw_fs_lower_d2f.cpp \
+ brw_fs_lower_d2x.cpp \
brw_fs_lower_pack.cpp \
brw_fs_nir.cpp \
brw_fs_reg_allocate.cpp \
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp
b/src/mesa/drivers/dri/i965/brw_fs.cpp
index cac4c20..fbdd802 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -5349,7 +5349,7 @@ fs_visitor::optimize()
OPT(dead_code_eliminate);
}
- if (OPT(lower_d2f)) {
+ if (OPT(lower_d2x)) {
OPT(opt_copy_propagate);
OPT(dead_code_eliminate);
}
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h
b/src/mesa/drivers/dri/i965/brw_fs.h
index e57bc6b..1f18112 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -173,7 +173,7 @@ public:
void lower_uniform_pull_constant_loads();
bool lower_load_payload();
bool lower_pack();
- bool lower_d2f();
+ bool lower_d2x();
bool lower_logical_sends();
bool lower_integer_multiplication();
bool lower_minmax();
diff --git a/src/mesa/drivers/dri/i965/brw_fs_lower_d2f.cpp
b/src/mesa/drivers/dri/i965/brw_fs_lower_d2f.cpp
deleted file mode 100644
index 606597b..0000000
--- a/src/mesa/drivers/dri/i965/brw_fs_lower_d2f.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright © 2015 Connor Abbott
- *
- * 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.
- */
-
-#include "brw_fs.h"
-#include "brw_cfg.h"
-#include "brw_fs_builder.h"
-
-using namespace brw;
-
-bool
-fs_visitor::lower_d2f()
-{
- bool progress = false;
-
- foreach_block_and_inst_safe(block, fs_inst, inst, cfg) {
- if (inst->opcode != BRW_OPCODE_MOV)
- continue;
-
- if (inst->dst.type != BRW_REGISTER_TYPE_F &&
- inst->dst.type != BRW_REGISTER_TYPE_D &&
- inst->dst.type != BRW_REGISTER_TYPE_UD)
- continue;
-
- if (inst->src[0].type != BRW_REGISTER_TYPE_DF)
- continue;
-
- assert(inst->dst.file == VGRF);
- assert(inst->saturate == false);
- fs_reg dst = inst->dst;
-
- const fs_builder ibld(this, block, inst);
-
- /* From the Broadwell PRM, 3D Media GPGPU, "Double Precision Float to
- * Single Precision Float":
- *
- * The upper Dword of every Qword will be written with undefined
- * value when converting DF to F.
- *
- * So we need to allocate a temporary that's two registers, and then do
- * a strided MOV to get the lower DWord of every Qword that has the
- * result.
- */
- fs_reg temp = ibld.vgrf(inst->dst.type, 2);
- ibld.MOV(stride(temp, 2), inst->src[0]);
- ibld.MOV(dst, stride(temp, 2));
-
- inst->remove(block);
- progress = true;
- }
-
- if (progress)
- invalidate_live_intervals();
-
- return progress;
-}
diff --git a/src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp
b/src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp
new file mode 100644
index 0000000..4da0a50
--- /dev/null
+++ b/src/mesa/drivers/dri/i965/brw_fs_lower_d2x.cpp
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2015 Connor Abbott
+ *
+ * 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.
+ */
+
+#include "brw_fs.h"
+#include "brw_cfg.h"
+#include "brw_fs_builder.h"
+
+using namespace brw;
+
+bool
+fs_visitor::lower_d2x()
+{
+ bool progress = false;
+
+ foreach_block_and_inst_safe(block, fs_inst, inst, cfg) {
+ if (inst->opcode != BRW_OPCODE_MOV)
+ continue;
+
+ if (inst->dst.type != BRW_REGISTER_TYPE_F &&
+ inst->dst.type != BRW_REGISTER_TYPE_D &&
+ inst->dst.type != BRW_REGISTER_TYPE_UD)
+ continue;
+
+ if (inst->src[0].type != BRW_REGISTER_TYPE_DF)
+ continue;
+
+ assert(inst->dst.file == VGRF);
+ assert(inst->saturate == false);
+ fs_reg dst = inst->dst;
+
+ const fs_builder ibld(this, block, inst);
+
+ /* From the Broadwell PRM, 3D Media GPGPU, "Double Precision Float to
+ * Single Precision Float":
+ *
+ * The upper Dword of every Qword will be written with undefined
+ * value when converting DF to F.
+ *
+ * So we need to allocate a temporary that's two registers, and then do
+ * a strided MOV to get the lower DWord of every Qword that has the
+ * result.
+ */
+ fs_reg temp = ibld.vgrf(inst->dst.type, 2);
+ ibld.MOV(stride(temp, 2), inst->src[0]);
+ ibld.MOV(dst, stride(temp, 2));
+
+ inst->remove(block);
+ progress = true;
+ }
+
+ if (progress)
+ invalidate_live_intervals();
+
+ return progress;
+}
--
2.5.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
