Skip to content

Commit 0eb7de5

Browse files
committed
[core] clang warning
1 parent e438960 commit 0eb7de5

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

vpr/src/base/SetupVibGrid.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ static VibDeviceGrid build_vib_device_grid(const t_vib_grid_def& grid_def, size_
157157
if (startx > grid_width - 1) {
158158
if (warn_out_of_range) {
159159
VTR_LOG_WARN("Block type '%s' grid location specification startx (%s = %d) falls outside device horizontal range [%d,%d]\n",
160-
type->get_name(), xspec.start_expr.c_str(), startx, 0, grid_width - 1);
160+
type->get_name().c_str(), xspec.start_expr.c_str(), startx, 0, grid_width - 1);
161161
}
162162
continue; //No instances will be created
163163
}
164164

165165
if (starty > grid_height - 1) {
166166
if (warn_out_of_range) {
167167
VTR_LOG_WARN("Block type '%s' grid location specification starty (%s = %d) falls outside device vertical range [%d,%d]\n",
168-
type->get_name(), yspec.start_expr.c_str(), starty, 0, grid_height - 1);
168+
type->get_name().c_str(), yspec.start_expr.c_str(), starty, 0, grid_height - 1);
169169
}
170170
continue; //No instances will be created
171171
}
@@ -174,14 +174,14 @@ static VibDeviceGrid build_vib_device_grid(const t_vib_grid_def& grid_def, size_
174174
if (endx > grid_width - 1) {
175175
if (warn_out_of_range) {
176176
VTR_LOG_WARN("Block type '%s' grid location specification endx (%s = %d) falls outside device horizontal range [%d,%d]\n",
177-
type->get_name(), xspec.end_expr.c_str(), endx, 0, grid_width - 1);
177+
type->get_name().c_str(), xspec.end_expr.c_str(), endx, 0, grid_width - 1);
178178
}
179179
}
180180

181181
if (endy > grid_height - 1) {
182182
if (warn_out_of_range) {
183183
VTR_LOG_WARN("Block type '%s' grid location specification endy (%s = %d) falls outside device vertical range [%d,%d]\n",
184-
type->get_name(), yspec.end_expr.c_str(), endy, 0, grid_height - 1);
184+
type->get_name().c_str(), yspec.end_expr.c_str(), endy, 0, grid_height - 1);
185185
}
186186
}
187187

@@ -204,15 +204,15 @@ static VibDeviceGrid build_vib_device_grid(const t_vib_grid_def& grid_def, size_
204204
VPR_FATAL_ERROR(VPR_ERROR_ARCH,
205205
"Grid location specification incrx for block type '%s' must be at least"
206206
" block width (%d) to avoid overlapping instances (was %s = %d)",
207-
type->get_name(), 1, xspec.incr_expr.c_str(), incrx);
207+
type->get_name().c_str(), 1, xspec.incr_expr.c_str(), incrx);
208208
}
209209

210210
//VTR_ASSERT(type->height > 0);
211211
if (incry < 1/*size_t(type->height)*/) {
212212
VPR_FATAL_ERROR(VPR_ERROR_ARCH,
213213
"Grid location specification incry for block type '%s' must be at least"
214214
" block height (%d) to avoid overlapping instances (was %s = %d)",
215-
type->get_name(), 1, yspec.incr_expr.c_str(), incry);
215+
type->get_name().c_str(), 1, yspec.incr_expr.c_str(), incry);
216216
}
217217

218218
//The minimum repeat is the region dimension
@@ -221,15 +221,15 @@ static VibDeviceGrid build_vib_device_grid(const t_vib_grid_def& grid_def, size_
221221
VPR_FATAL_ERROR(VPR_ERROR_ARCH,
222222
"Grid location specification repeatx for block type '%s' must be at least"
223223
" the region width (%d) to avoid overlapping instances (was %s = %d)",
224-
type->get_name(), region_width, xspec.repeat_expr.c_str(), repeatx);
224+
type->get_name().c_str(), region_width, xspec.repeat_expr.c_str(), repeatx);
225225
}
226226

227227
size_t region_height = endy - starty + 1; //+1 since start/end are both inclusive
228228
if (repeaty < region_height) {
229229
VPR_FATAL_ERROR(VPR_ERROR_ARCH,
230230
"Grid location specification repeaty for block type '%s' must be at least"
231231
" the region height (%d) to avoid overlapping instances (was %s = %d)",
232-
type->get_name(), region_height, xspec.repeat_expr.c_str(), repeaty);
232+
type->get_name().c_str(), region_height, xspec.repeat_expr.c_str(), repeaty);
233233
}
234234

235235
//VTR_LOG("Applying grid_loc_def for '%s' priority %d startx=%s=%zu, endx=%s=%zu, starty=%s=%zu, endx=%s=%zu,\n",
@@ -325,7 +325,7 @@ static void set_vib_grid_block_type(int priority,
325325
//Lower priority, do not override
326326
#ifdef VERBOSE
327327
VTR_LOG("Not creating block '%s' at (%zu,%zu) since overlaps block '%s' at (%zu,%zu) with higher priority (%d > %d)\n",
328-
type->name, x_root, y_root, max_priority_type_loc.type->name, max_priority_type_loc.x, max_priority_type_loc.y,
328+
type->name.c_str(), x_root, y_root, max_priority_type_loc.type->name, max_priority_type_loc.x, max_priority_type_loc.y,
329329
max_priority_type_loc.priority, priority);
330330
#endif
331331
return;
@@ -341,8 +341,8 @@ static void set_vib_grid_block_type(int priority,
341341
" Existing block type '%s' at (%zu,%zu) has the same priority (%d) as new overlapping type '%s'."
342342
" The last specification will apply.\n",
343343
x_root, y_root,
344-
max_priority_type_loc.type->get_name(), max_priority_type_loc.x, max_priority_type_loc.y,
345-
priority, type->get_name());
344+
max_priority_type_loc.type->get_name().c_str(), max_priority_type_loc.x, max_priority_type_loc.y,
345+
priority, type->get_name().c_str());
346346
}
347347

348348
//Mark all the grid tiles 'covered' by this block with the appropriate type
@@ -405,9 +405,9 @@ static void set_vib_grid_block_type(int priority,
405405

406406
#ifdef VERBOSE
407407
VTR_LOG("Ripping up block '%s' at (%d,%d) offset (%d,%d). Overlapped by '%s' at (%d,%d)\n",
408-
invalidated_root.type->name, invalidated_root.x, invalidated_root.y,
408+
invalidated_root.type->name.c_str(), invalidated_root.x, invalidated_root.y,
409409
x_offset, y_offset,
410-
type->name, x_root, y_root);
410+
type->name.c_str(), x_root, y_root);
411411
#endif
412412

413413
vib_grid[layer_num][x][y] = nullptr;

0 commit comments

Comments
 (0)