public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-12] nvptx: support bar.red instruction
@ 2022-12-21 18:21 Tobias Burnus
0 siblings, 0 replies; only message in thread
From: Tobias Burnus @ 2022-12-21 18:21 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:7781f306e3268b054adb40dabd99be02b3f286fd
commit 7781f306e3268b054adb40dabd99be02b3f286fd
Author: Chung-Lin Tang <cltang@codesourcery.com>
Date: Wed Dec 21 18:55:19 2022 +0100
nvptx: support bar.red instruction
This patch adds support for the PTX 'bar.red' (i.e. "barrier reduction")
instruction, in the form of nvptx-specific __builtin_nvptx_bar_red_[and/or/popc]
built-in functions.
gcc/ChangeLog:
* config/nvptx/nvptx.cc (nvptx_print_operand): Add 'p' case, adjust
comments.
(enum nvptx_builtins): Add NVPTX_BUILTIN_BAR_RED_AND,
NVPTX_BUILTIN_BAR_RED_OR, and NVPTX_BUILTIN_BAR_RED_POPC.
(nvptx_expand_bar_red): New function.
(nvptx_init_builtins):
Add DEFs of __builtin_nvptx_bar_red_[and/or/popc].
(nvptx_expand_builtin): Use nvptx_expand_bar_red to expand
NVPTX_BUILTIN_BAR_RED_[AND/OR/POPC] cases.
* config/nvptx/nvptx.md (define_c_enum "unspecv"): Add
UNSPECV_BARRED_AND, UNSPECV_BARRED_OR, and UNSPECV_BARRED_POPC.
(BARRED): New int iterator.
(barred_op,barred_mode,barred_ptxtype): New int attrs.
(nvptx_barred_<barred_op>): New define_insn.
(cherry picked from commit 623daaf8a229fcb58f84448d954f8c71191ca486)
Diff:
---
gcc/ChangeLog.omp | 20 ++++++++++
gcc/config/nvptx/nvptx.cc | 100 ++++++++++++++++++++++++++++++++++++++++++++++
gcc/config/nvptx/nvptx.md | 32 +++++++++++++++
3 files changed, 152 insertions(+)
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index a567ae7a0c7..b54037bee27 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,23 @@
+2022-12-21 Tobias Burnus <tobias@codesourcery.com>
+
+ Backported from master:
+ 2022-12-21 Chung-Lin Tang <cltang@codesourcery.com>
+
+ * config/nvptx/nvptx.cc (nvptx_print_operand): Add 'p' case, adjust
+ comments.
+ (enum nvptx_builtins): Add NVPTX_BUILTIN_BAR_RED_AND,
+ NVPTX_BUILTIN_BAR_RED_OR, and NVPTX_BUILTIN_BAR_RED_POPC.
+ (nvptx_expand_bar_red): New function.
+ (nvptx_init_builtins):
+ Add DEFs of __builtin_nvptx_bar_red_[and/or/popc].
+ (nvptx_expand_builtin): Use nvptx_expand_bar_red to expand
+ NVPTX_BUILTIN_BAR_RED_[AND/OR/POPC] cases.
+ * config/nvptx/nvptx.md (define_c_enum "unspecv"): Add
+ UNSPECV_BARRED_AND, UNSPECV_BARRED_OR, and UNSPECV_BARRED_POPC.
+ (BARRED): New int iterator.
+ (barred_op,barred_mode,barred_ptxtype): New int attrs.
+ (nvptx_barred_<barred_op>): New define_insn.
+
2022-12-06 Marcel Vollweiler <marcel@codesourcery.com>
Backported from master:
diff --git a/gcc/config/nvptx/nvptx.cc b/gcc/config/nvptx/nvptx.cc
index 854ebe10bbd..da735cf82ff 100644
--- a/gcc/config/nvptx/nvptx.cc
+++ b/gcc/config/nvptx/nvptx.cc
@@ -2884,6 +2884,7 @@ nvptx_mem_maybe_shared_p (const_rtx x)
t -- print a type opcode suffix, promoting QImode to 32 bits
T -- print a type size in bits
u -- print a type opcode suffix without promotions.
+ p -- print a '!' for constant 0.
x -- print a destination operand that may also be a bit bucket. */
static void
@@ -3017,6 +3018,11 @@ nvptx_print_operand (FILE *file, rtx x, int code)
fprintf (file, "@!");
goto common;
+ case 'p':
+ if (INTVAL (x) == 0)
+ fprintf (file, "!");
+ break;
+
case 'c':
mode = GET_MODE (XEXP (x, 0));
switch (x_code)
@@ -6220,10 +6226,91 @@ enum nvptx_builtins
NVPTX_BUILTIN_CMP_SWAPLL,
NVPTX_BUILTIN_MEMBAR_GL,
NVPTX_BUILTIN_MEMBAR_CTA,
+ NVPTX_BUILTIN_BAR_RED_AND,
+ NVPTX_BUILTIN_BAR_RED_OR,
+ NVPTX_BUILTIN_BAR_RED_POPC,
NVPTX_BUILTIN_COND_UNI,
NVPTX_BUILTIN_MAX
};
+/* Expander for 'bar.red' instruction builtins. */
+
+static rtx
+nvptx_expand_bar_red (tree exp, rtx target,
+ machine_mode ARG_UNUSED (m), int ARG_UNUSED (ignore))
+{
+ int code = DECL_MD_FUNCTION_CODE (TREE_OPERAND (CALL_EXPR_FN (exp), 0));
+ machine_mode mode = TYPE_MODE (TREE_TYPE (exp));
+
+ if (!target)
+ target = gen_reg_rtx (mode);
+
+ rtx pred, dst;
+ rtx bar = expand_expr (CALL_EXPR_ARG (exp, 0),
+ NULL_RTX, SImode, EXPAND_NORMAL);
+ rtx nthr = expand_expr (CALL_EXPR_ARG (exp, 1),
+ NULL_RTX, SImode, EXPAND_NORMAL);
+ rtx cpl = expand_expr (CALL_EXPR_ARG (exp, 2),
+ NULL_RTX, SImode, EXPAND_NORMAL);
+ rtx redop = expand_expr (CALL_EXPR_ARG (exp, 3),
+ NULL_RTX, SImode, EXPAND_NORMAL);
+ if (CONST_INT_P (bar))
+ {
+ if (INTVAL (bar) < 0 || INTVAL (bar) > 15)
+ {
+ error_at (EXPR_LOCATION (exp),
+ "barrier value must be within [0,15]");
+ return const0_rtx;
+ }
+ }
+ else if (!REG_P (bar))
+ bar = copy_to_mode_reg (SImode, bar);
+
+ if (!CONST_INT_P (nthr) && !REG_P (nthr))
+ nthr = copy_to_mode_reg (SImode, nthr);
+
+ if (!CONST_INT_P (cpl))
+ {
+ error_at (EXPR_LOCATION (exp),
+ "complement argument must be constant");
+ return const0_rtx;
+ }
+
+ pred = gen_reg_rtx (BImode);
+ if (!REG_P (redop))
+ redop = copy_to_mode_reg (SImode, redop);
+ emit_insn (gen_rtx_SET (pred, gen_rtx_NE (BImode, redop, GEN_INT (0))));
+ redop = pred;
+
+ rtx pat;
+ switch (code)
+ {
+ case NVPTX_BUILTIN_BAR_RED_AND:
+ dst = gen_reg_rtx (BImode);
+ pat = gen_nvptx_barred_and (dst, bar, nthr, cpl, redop);
+ break;
+ case NVPTX_BUILTIN_BAR_RED_OR:
+ dst = gen_reg_rtx (BImode);
+ pat = gen_nvptx_barred_or (dst, bar, nthr, cpl, redop);
+ break;
+ case NVPTX_BUILTIN_BAR_RED_POPC:
+ dst = gen_reg_rtx (SImode);
+ pat = gen_nvptx_barred_popc (dst, bar, nthr, cpl, redop);
+ break;
+ default:
+ gcc_unreachable ();
+ }
+ emit_insn (pat);
+ if (GET_MODE (dst) == BImode)
+ {
+ rtx tmp = gen_reg_rtx (mode);
+ emit_insn (gen_rtx_SET (tmp, gen_rtx_NE (mode, dst, GEN_INT (0))));
+ dst = tmp;
+ }
+ emit_move_insn (target, dst);
+ return target;
+}
+
static GTY(()) tree nvptx_builtin_decls[NVPTX_BUILTIN_MAX];
/* Return the NVPTX builtin for CODE. */
@@ -6263,6 +6350,14 @@ nvptx_init_builtins (void)
DEF (CMP_SWAPLL, "cmp_swapll", (LLUINT, PTRVOID, LLUINT, LLUINT, NULL_TREE));
DEF (MEMBAR_GL, "membar_gl", (VOID, VOID, NULL_TREE));
DEF (MEMBAR_CTA, "membar_cta", (VOID, VOID, NULL_TREE));
+
+ DEF (BAR_RED_AND, "bar_red_and",
+ (UINT, UINT, UINT, UINT, UINT, NULL_TREE));
+ DEF (BAR_RED_OR, "bar_red_or",
+ (UINT, UINT, UINT, UINT, UINT, NULL_TREE));
+ DEF (BAR_RED_POPC, "bar_red_popc",
+ (UINT, UINT, UINT, UINT, UINT, NULL_TREE));
+
DEF (COND_UNI, "cond_uni", (integer_type_node, integer_type_node, NULL_TREE));
#undef DEF
@@ -6307,6 +6402,11 @@ nvptx_expand_builtin (tree exp, rtx target, rtx ARG_UNUSED (subtarget),
emit_insn (gen_nvptx_membar_cta ());
return NULL_RTX;
+ case NVPTX_BUILTIN_BAR_RED_AND:
+ case NVPTX_BUILTIN_BAR_RED_OR:
+ case NVPTX_BUILTIN_BAR_RED_POPC:
+ return nvptx_expand_bar_red (exp, target, mode, ignore);
+
case NVPTX_BUILTIN_COND_UNI:
return nvptx_expand_cond_uni (exp, target, mode, ignore);
diff --git a/gcc/config/nvptx/nvptx.md b/gcc/config/nvptx/nvptx.md
index 995f52b9492..04c150b8982 100644
--- a/gcc/config/nvptx/nvptx.md
+++ b/gcc/config/nvptx/nvptx.md
@@ -58,6 +58,9 @@
UNSPECV_CAS_LOCAL
UNSPECV_XCHG
UNSPECV_ST
+ UNSPECV_BARRED_AND
+ UNSPECV_BARRED_OR
+ UNSPECV_BARRED_POPC
UNSPECV_BARSYNC
UNSPECV_WARPSYNC
UNSPECV_UNIFORM_WARP_CHECK
@@ -2281,6 +2284,35 @@
"TARGET_PTX_6_0"
"%.\\tbar.warp.sync\\t0xffffffff;")
+(define_int_iterator BARRED
+ [UNSPECV_BARRED_AND
+ UNSPECV_BARRED_OR
+ UNSPECV_BARRED_POPC])
+(define_int_attr barred_op
+ [(UNSPECV_BARRED_AND "and")
+ (UNSPECV_BARRED_OR "or")
+ (UNSPECV_BARRED_POPC "popc")])
+(define_int_attr barred_mode
+ [(UNSPECV_BARRED_AND "BI")
+ (UNSPECV_BARRED_OR "BI")
+ (UNSPECV_BARRED_POPC "SI")])
+(define_int_attr barred_ptxtype
+ [(UNSPECV_BARRED_AND "pred")
+ (UNSPECV_BARRED_OR "pred")
+ (UNSPECV_BARRED_POPC "u32")])
+
+(define_insn "nvptx_barred_<barred_op>"
+ [(set (match_operand:<barred_mode> 0 "nvptx_register_operand" "=R")
+ (unspec_volatile
+ [(match_operand:SI 1 "nvptx_nonmemory_operand" "Ri")
+ (match_operand:SI 2 "nvptx_nonmemory_operand" "Ri")
+ (match_operand:SI 3 "const_int_operand" "i")
+ (match_operand:BI 4 "nvptx_register_operand" "R")]
+ BARRED))]
+ ""
+ "\\tbar.red.<barred_op>.<barred_ptxtype> \\t%0, %1, %2, %p3%4;";"
+ [(set_attr "predicable" "no")])
+
(define_insn "nvptx_uniform_warp_check"
[(unspec_volatile [(const_int 0)] UNSPECV_UNIFORM_WARP_CHECK)]
""
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-21 18:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-21 18:21 [gcc/devel/omp/gcc-12] nvptx: support bar.red instruction Tobias Burnus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).