summaryrefslogtreecommitdiff
path: root/src/panfrost/midgard
diff options
context:
space:
mode:
authorAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>2021-01-27 12:17:59 -0500
committerAlyssa Rosenzweig <alyssa.rosenzweig@collabora.com>2021-02-12 16:44:30 -0500
commit887e39144761e62b74872f3ccd7c033c2baaa925 (patch)
treefe28df3e3668f094d269f5a2e371548651e77c47 /src/panfrost/midgard
parente55af16bfed950d9662cb4ee43381f5bc4407924 (diff)
pan/mdg: Rename bitcount8 to popcnt, fixing the unit
Still doesn't seem to work correctly for negative values. Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8774>
Diffstat (limited to 'src/panfrost/midgard')
-rw-r--r--src/panfrost/midgard/midgard.h2
-rw-r--r--src/panfrost/midgard/midgard_ops.c2
-rw-r--r--src/panfrost/midgard/midgard_print_constant.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h
index 36c36c5bfcf..e8860db21ea 100644
--- a/src/panfrost/midgard/midgard.h
+++ b/src/panfrost/midgard/midgard.h
@@ -128,7 +128,7 @@ typedef enum {
midgard_alu_op_ixor = 0x76,
midgard_alu_op_inxor = 0x77, /* ~(a & b) */
midgard_alu_op_iclz = 0x78, /* Number of zeroes on left */
- midgard_alu_op_ibitcount8 = 0x7A, /* Counts bits in 8-bit increments */
+ midgard_alu_op_ipopcnt = 0x7A, /* Population count */
midgard_alu_op_imov = 0x7B,
midgard_alu_op_iabsdiff = 0x7C,
midgard_alu_op_uabsdiff = 0x7D,
diff --git a/src/panfrost/midgard/midgard_ops.c b/src/panfrost/midgard/midgard_ops.c
index 34f49bec001..b4a65ec91a3 100644
--- a/src/panfrost/midgard/midgard_ops.c
+++ b/src/panfrost/midgard/midgard_ops.c
@@ -136,7 +136,7 @@ struct mir_op_props alu_opcode_props[256] = {
[midgard_alu_op_ixor] = {"ixor", UNITS_MOST | OP_COMMUTES},
[midgard_alu_op_inxor] = {"inxor", UNITS_MOST | OP_COMMUTES},
[midgard_alu_op_iclz] = {"iclz", UNITS_ADD},
- [midgard_alu_op_ibitcount8] = {"ibitcount8", UNITS_ADD},
+ [midgard_alu_op_ipopcnt] = {"ipopcnt", UNIT_VADD},
[midgard_alu_op_inand] = {"inand", UNITS_MOST},
[midgard_alu_op_ishl] = {"ishl", UNITS_ADD},
[midgard_alu_op_iasr] = {"iasr", UNITS_ADD},
diff --git a/src/panfrost/midgard/midgard_print_constant.c b/src/panfrost/midgard/midgard_print_constant.c
index b280dc2d08e..b0e295d157e 100644
--- a/src/panfrost/midgard/midgard_print_constant.c
+++ b/src/panfrost/midgard/midgard_print_constant.c
@@ -53,7 +53,7 @@ mir_print_constant_component(FILE *fp, const midgard_constants *consts, unsigned
* be true for all of them, but it's good enough for traces.
*/
if (op >= midgard_alu_op_iand &&
- op <= midgard_alu_op_ibitcount8)
+ op <= midgard_alu_op_ipopcnt)
is_hex = true;
else
is_sint = true;