From 6ae453ab28cea08c05a3c451d9fa973c4a66d888 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 16 Nov 2016 13:52:48 -0600 Subject: [PATCH 1/2] slab -> loop (it's no longer a slab) --- loopy/codegen/loop.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/loopy/codegen/loop.py b/loopy/codegen/loop.py index d0d68edec..cf7b96eef 100644 --- a/loopy/codegen/loop.py +++ b/loopy/codegen/loop.py @@ -401,24 +401,24 @@ def generate_sequential_loop_dim_code(codegen_state, sched_index): # }}} - # {{{ find implemented slab, build inner code + # {{{ find implemented loop, build inner code from loopy.isl_helpers import make_loop_bound_from_pwaffs - # impl_slab may be overapproximated - impl_slab = make_loop_bound_from_pwaffs( + # impl_loop may be overapproximated + impl_loop = make_loop_bound_from_pwaffs( dom_and_slab.space, loop_iname, lbound, ubound) for iname in moved_inames: - dt, idx = impl_slab.get_var_dict()[iname] - impl_slab = impl_slab.move_dims( - dim_type.set, impl_slab.dim(dim_type.set), + dt, idx = impl_loop.get_var_dict()[iname] + impl_loop = impl_loop.move_dims( + dim_type.set, impl_loop.dim(dim_type.set), dt, idx, 1) new_codegen_state = ( codegen_state - .intersect(impl_slab) + .intersect(impl_loop) .copy(kernel=intersect_kernel_with_slab( kernel, slab, iname))) -- GitLab From 3c7540ecd9dd5ee0f5c1a6bc72e541ffe5184b5c Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 16 Nov 2016 14:25:56 -0600 Subject: [PATCH 2/2] make_loop_bound_from_pwaffs -> make_loop_bounds_from_pwaffs --- loopy/codegen/loop.py | 4 ++-- loopy/isl_helpers.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loopy/codegen/loop.py b/loopy/codegen/loop.py index cf7b96eef..3d3095d53 100644 --- a/loopy/codegen/loop.py +++ b/loopy/codegen/loop.py @@ -403,10 +403,10 @@ def generate_sequential_loop_dim_code(codegen_state, sched_index): # {{{ find implemented loop, build inner code - from loopy.isl_helpers import make_loop_bound_from_pwaffs + from loopy.isl_helpers import make_loop_bounds_from_pwaffs # impl_loop may be overapproximated - impl_loop = make_loop_bound_from_pwaffs( + impl_loop = make_loop_bounds_from_pwaffs( dom_and_slab.space, loop_iname, lbound, ubound) diff --git a/loopy/isl_helpers.py b/loopy/isl_helpers.py index 82441eb7f..602830de3 100644 --- a/loopy/isl_helpers.py +++ b/loopy/isl_helpers.py @@ -102,7 +102,7 @@ def make_slab(space, iname, start, stop): return result -def make_loop_bound_from_pwaffs(space, iname, lbound, ubound): +def make_loop_bounds_from_pwaffs(space, iname, lbound, ubound): dt, pos = space.get_var_dict()[iname] iname_pwaff = isl.PwAff.var_on_domain(space, dt, pos) -- GitLab