From 2b7419d090cc474f363d04221e4b9e0f5f464a25 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Thu, 7 Jul 2022 01:12:24 -0700 Subject: [PATCH] intel/fs: Fix signedness of payload_node_count argument of calculate_payload_ranges(). Reviewed-by: Jordan Justen Part-of: --- src/intel/compiler/brw_fs.h | 2 +- src/intel/compiler/brw_fs_reg_allocate.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/intel/compiler/brw_fs.h b/src/intel/compiler/brw_fs.h index 043395f..67b333f 100644 --- a/src/intel/compiler/brw_fs.h +++ b/src/intel/compiler/brw_fs.h @@ -247,7 +247,7 @@ public: void assign_gs_urb_setup(); bool assign_regs(bool allow_spilling, bool spill_all); void assign_regs_trivial(); - void calculate_payload_ranges(int payload_node_count, + void calculate_payload_ranges(unsigned payload_node_count, int *payload_last_use_ip) const; bool split_virtual_grfs(); bool compact_virtual_grfs(); diff --git a/src/intel/compiler/brw_fs_reg_allocate.cpp b/src/intel/compiler/brw_fs_reg_allocate.cpp index 7b4551e..ecf77cd 100644 --- a/src/intel/compiler/brw_fs_reg_allocate.cpp +++ b/src/intel/compiler/brw_fs_reg_allocate.cpp @@ -208,13 +208,13 @@ count_to_loop_end(const bblock_t *block) unreachable("not reached"); } -void fs_visitor::calculate_payload_ranges(int payload_node_count, +void fs_visitor::calculate_payload_ranges(unsigned payload_node_count, int *payload_last_use_ip) const { int loop_depth = 0; int loop_end_ip = 0; - for (int i = 0; i < payload_node_count; i++) + for (unsigned i = 0; i < payload_node_count; i++) payload_last_use_ip[i] = -1; int ip = 0; @@ -250,23 +250,23 @@ void fs_visitor::calculate_payload_ranges(int payload_node_count, */ for (int i = 0; i < inst->sources; i++) { if (inst->src[i].file == FIXED_GRF) { - int node_nr = inst->src[i].nr; + unsigned node_nr = inst->src[i].nr; if (node_nr >= payload_node_count) continue; for (unsigned j = 0; j < regs_read(inst, i); j++) { payload_last_use_ip[node_nr + j] = use_ip; - assert(node_nr + j < unsigned(payload_node_count)); + assert(node_nr + j < payload_node_count); } } } if (inst->dst.file == FIXED_GRF) { - int node_nr = inst->dst.nr; + unsigned node_nr = inst->dst.nr; if (node_nr < payload_node_count) { for (unsigned j = 0; j < regs_written(inst); j++) { payload_last_use_ip[node_nr + j] = use_ip; - assert(node_nr + j < unsigned(payload_node_count)); + assert(node_nr + j < payload_node_count); } } } -- 2.7.4