diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/brig-builtins.def | 6 | ||||
| -rw-r--r-- | gcc/brig/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/brig/brigfrontend/brig-to-generic.cc | 22 |
4 files changed, 32 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e27d0ba..f0a5a3d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-09-25 Pekka Jaaskelainen <pekka@parmance.com> + + * brig-builtins.def: Treat HSAIL barrier builtins as + setjmp/longjump style functions. + 2017-09-25 Richard Sandiford <richard.sandiford@linaro.org> * target.def (constant_alignment): New hook. diff --git a/gcc/brig-builtins.def b/gcc/brig-builtins.def index f525610..39f403e 100644 --- a/gcc/brig-builtins.def +++ b/gcc/brig-builtins.def @@ -240,7 +240,7 @@ DEF_HSAIL_BUILTIN (BUILT_IN_HSAIL_FRACT_F64, BRIG_OPCODE_FRACT, DEF_HSAIL_BUILTIN (BUILT_IN_HSAIL_BARRIER, BRIG_OPCODE_BARRIER, BRIG_TYPE_NONE, "__hsail_barrier", BT_FN_VOID_PTR, - ATTR_NOTHROW_LIST) + ATTR_RT_NOTHROW_LEAF_LIST) DEF_HSAIL_BUILTIN (BUILT_IN_HSAIL_INITFBAR, BRIG_OPCODE_INITFBAR, BRIG_TYPE_NONE, "__hsail_initfbar", BT_FN_VOID_UINT_PTR, @@ -252,11 +252,11 @@ DEF_HSAIL_BUILTIN (BUILT_IN_HSAIL_JOINFBAR, BRIG_OPCODE_JOINFBAR, DEF_HSAIL_BUILTIN (BUILT_IN_HSAIL_WAITFBAR, BRIG_OPCODE_WAITFBAR, BRIG_TYPE_NONE, "__hsail_waitfbar", BT_FN_VOID_UINT_PTR, - ATTR_NOTHROW_LIST) + ATTR_RT_NOTHROW_LEAF_LIST) DEF_HSAIL_BUILTIN (BUILT_IN_HSAIL_ARRIVEFBAR, BRIG_OPCODE_ARRIVEFBAR, BRIG_TYPE_NONE, "__hsail_arrivefbar", BT_FN_VOID_UINT_PTR, - ATTR_NOTHROW_LIST) + ATTR_RT_NOTHROW_LEAF_LIST) DEF_HSAIL_BUILTIN (BUILT_IN_HSAIL_LEAVEFBAR, BRIG_OPCODE_LEAVEFBAR, BRIG_TYPE_NONE, "__hsail_leavefbar", BT_FN_VOID_UINT_PTR, diff --git a/gcc/brig/ChangeLog b/gcc/brig/ChangeLog index ebf31c4..69c57cb 100644 --- a/gcc/brig/ChangeLog +++ b/gcc/brig/ChangeLog @@ -1,3 +1,8 @@ +2017-05-13 Pekka Jääskeläinen <pekka.jaaskelainen@parmance.com> + + * brigfrontend/brig-to-generic.cc: Ensure per WI copies of + private variables are aligned too. + 2017-09-17 Thomas Schwinge <thomas@codesourcery.com> * Make-lang.in (GO_TEXI_FILES): Rename to... diff --git a/gcc/brig/brigfrontend/brig-to-generic.cc b/gcc/brig/brigfrontend/brig-to-generic.cc index 7559c05..2b1d94e 100644 --- a/gcc/brig/brigfrontend/brig-to-generic.cc +++ b/gcc/brig/brigfrontend/brig-to-generic.cc @@ -599,18 +599,34 @@ brig_to_generic::group_segment_size () const return m_next_group_offset; } -/* Appends a new group variable to the current kernel's private segment. */ +/* Appends a new variable to the current kernel's private segment. */ void brig_to_generic::append_private_variable (const std::string &name, size_t size, size_t alignment) { + /* We need to take care of two cases of alignment with private + variables because of the layout where the same variable for + each work-item is laid out in successive addresses. + + 1) Ensure the first work-item's variable is in an aligned + offset: */ size_t align_padding = m_next_private_offset % alignment == 0 ? 0 : (alignment - m_next_private_offset % alignment); + + /* 2) Each successive per-work-item copy should be aligned. + If the variable has wider alignment than size then we need + to add extra padding to ensure it. The padding must be + included in the size to allow per-work-item offset computation + to find their own aligned copy. */ + + size_t per_var_padding = size % alignment == 0 ? + 0 : (alignment - size % alignment); + m_private_data_sizes[name] = size + per_var_padding; + m_next_private_offset += align_padding; m_private_offsets[name] = m_next_private_offset; - m_next_private_offset += size; - m_private_data_sizes[name] = size + align_padding; + m_next_private_offset += size + per_var_padding; } size_t |