+(define_insn "*prefetch"
[(prefetch (match_operand:DI 0 "aarch64_prefetch_operand" "Dp")
(match_operand:QI 1 "const_int_operand" "")
- (match_operand:QI 2 "const_int_operand" ""))]
+ (match_operand:QI 2 "const_int_operand" "")
+ (const_int 1))]
""
{
const char * pftype[2][4] =
diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md
index 87514330c22..46fd6a7b7cb 100644
--- a/gcc/config/alpha/alpha.md
+++ b/gcc/config/alpha/alpha.md
@@ -5176,10 +5176,25 @@
;;
;; On EV6, these become official prefetch instructions.
-(define_insn "prefetch"
+(define_expand "prefetch"
+ [(prefetch (match_operand:DI 0 "address_operand")
+ (match_operand:DI 1 "const_int_operand")
+ (match_operand:DI 2 "const_int_operand")
+ (match_operand:DI 3 "const_int_operand"))]
+ "TARGET_FIXUP_EV5_PREFETCH || alpha_cpu == PROCESSOR_EV6"
+{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+})
+
+(define_insn "*prefetch"
[(prefetch (match_operand:DI 0 "address_operand" "p")
(match_operand:DI 1 "const_int_operand" "n")
- (match_operand:DI 2 "const_int_operand" "n"))]
+ (match_operand:DI 2 "const_int_operand" "n")
+ (const_int 1))]
"TARGET_FIXUP_EV5_PREFETCH || alpha_cpu == PROCESSOR_EV6"
{
/* Interpret "no temporal locality" as this data should be evicted once
diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md
index 458d3edf716..9607a0dd572 100644
--- a/gcc/config/arc/arc.md
+++ b/gcc/config/arc/arc.md
@@ -5255,14 +5255,22 @@ archs4x, archs4xd"
(define_expand "prefetch"
[(prefetch (match_operand:SI 0 "address_operand" "")
(match_operand:SI 1 "const_int_operand" "")
- (match_operand:SI 2 "const_int_operand" ""))]
+ (match_operand:SI 2 "const_int_operand" "")
+ (match_operand:SI 3 "const_int_operand" ""))]
"TARGET_HS"
- "")
+ {
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data
prefetch");
+ operands[3] = const1_rtx;
+ }
+ })
(define_insn "prefetch_1"
[(prefetch (match_operand:SI 0 "register_operand" "r")
(match_operand:SI 1 "const_int_operand" "n")
- (match_operand:SI 2 "const_int_operand" "n"))]
+ (match_operand:SI 2 "const_int_operand" "n")
+ (const_int 1))]
"TARGET_HS"
{
if (INTVAL (operands[1]))
@@ -5277,7 +5285,8 @@ archs4x, archs4xd"
[(prefetch (plus:SI (match_operand:SI 0 "register_operand" "r,r,r")
(match_operand:SI 1 "nonmemory_operand" "r,Cm2,Cal"))
(match_operand:SI 2 "const_int_operand" "n,n,n")
- (match_operand:SI 3 "const_int_operand" "n,n,n"))]
+ (match_operand:SI 3 "const_int_operand" "n,n,n")
+ (const_int 1))]
"TARGET_HS"
{
if (INTVAL (operands[2]))
@@ -5291,7 +5300,8 @@ archs4x, archs4xd"
(define_insn "prefetch_3"
[(prefetch (match_operand:SI 0 "address_operand" "p")
(match_operand:SI 1 "const_int_operand" "n")
- (match_operand:SI 2 "const_int_operand" "n"))]
+ (match_operand:SI 2 "const_int_operand" "n")
+ (const_int 1))]
"TARGET_HS"
{
operands[0] = gen_rtx_MEM (SImode, operands[0]);
diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md
index 69bf343fb0e..7f2ec97406f 100644
--- a/gcc/config/arm/arm.md
+++ b/gcc/config/arm/arm.md
@@ -12206,10 +12206,25 @@
;; V5E instructions.
-(define_insn "prefetch"
+(define_expand "prefetch"
+ [(prefetch (match_operand:SI 0 "address_operand")
+ (match_operand:SI 1 "")
+ (match_operand:SI 2 "")
+ (match_operand:SI 3 ""))]
+ "TARGET_32BIT && arm_arch5te"
+ {
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data
prefetch");
+ operands[3] = const1_rtx;
+ }
+ })
+
+(define_insn "*prefetch"
[(prefetch (match_operand:SI 0 "address_operand" "p")
(match_operand:SI 1 "" "")
- (match_operand:SI 2 "" ""))]
+ (match_operand:SI 2 "" "")
+ (const_int 1))]
"TARGET_32BIT && arm_arch5te"
"pld\\t%a0"
[(set_attr "type" "load_4")]
diff --git a/gcc/config/frv/frv.md b/gcc/config/frv/frv.md
index 6258fe3b99e..2fb9de593c9 100644
--- a/gcc/config/frv/frv.md
+++ b/gcc/config/frv/frv.md
@@ -7631,7 +7631,8 @@
[(prefetch (unspec:SI [(match_operand:SI 0 "register_operand" "r")]
UNSPEC_PREFETCH0)
(const_int 0)
- (const_int 0))]
+ (const_int 0)
+ (const_int 1))]
""
"dcpl %0, gr0, #0"
[(set_attr "length" "4")])
@@ -7640,7 +7641,8 @@
[(prefetch (unspec:SI [(match_operand:SI 0 "register_operand" "r")]
UNSPEC_PREFETCH)
(const_int 0)
- (const_int 0))]
+ (const_int 0)
+ (const_int 1))]
"TARGET_FR500_FR550_BUILTINS"
"nop.p\\n\\tnldub @(%0, gr0), gr0"
[(set_attr "length" "8")])
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 8e847520491..c65cf14b9f4 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -23635,9 +23635,15 @@
(define_expand "prefetch"
[(prefetch (match_operand 0 "address_operand")
(match_operand:SI 1 "const_int_operand")
- (match_operand:SI 2 "const_int_operand"))]
+ (match_operand:SI 2 "const_int_operand")
+ (match_operand:SI 3 "const_int_operand"))]
"TARGET_3DNOW || TARGET_PREFETCH_SSE || TARGET_PRFCHW || TARGET_PREFETCHWT1"
{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
bool write = operands[1] != const0_rtx;
int locality = INTVAL (operands[2]);
@@ -23679,7 +23685,8 @@
(define_insn "*prefetch_sse"
[(prefetch (match_operand 0 "address_operand" "p")
(const_int 0)
- (match_operand:SI 1 "const_int_operand"))]
+ (match_operand:SI 1 "const_int_operand")
+ (const_int 1))]
"TARGET_PREFETCH_SSE"
{
static const char * const patterns[4] = {
@@ -23700,7 +23707,8 @@
(define_insn "*prefetch_3dnow"
[(prefetch (match_operand 0 "address_operand" "p")
(match_operand:SI 1 "const_int_operand")
- (const_int 3))]
+ (const_int 3)
+ (const_int 1))]
"TARGET_3DNOW || TARGET_PRFCHW || TARGET_PREFETCHWT1"
{
if (operands[1] == const0_rtx)
@@ -23716,7 +23724,8 @@
(define_insn "*prefetch_prefetchwt1"
[(prefetch (match_operand 0 "address_operand" "p")
(const_int 1)
- (const_int 2))]
+ (const_int 2)
+ (const_int 1))]
"TARGET_PREFETCHWT1"
"prefetchwt1\t%a0";
[(set_attr "type" "sse")
diff --git a/gcc/config/ia64/ia64.md b/gcc/config/ia64/ia64.md
index 5d1d47da55b..9fbbea3412a 100644
--- a/gcc/config/ia64/ia64.md
+++ b/gcc/config/ia64/ia64.md
@@ -5018,10 +5018,25 @@
"break.f 0"
[(set_attr "itanium_class" "nop_f")])
-(define_insn "prefetch"
+(define_expand "prefetch"
+ [(prefetch (match_operand:DI 0 "address_operand")
+ (match_operand:DI 1 "const_int_operand")
+ (match_operand:DI 2 "const_int_operand")
+ (match_operand:DI 3 "const_int_operand"))]
+ ""
+{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+})
+
+(define_insn "*prefetch"
[(prefetch (match_operand:DI 0 "address_operand" "p")
(match_operand:DI 1 "const_int_operand" "n")
- (match_operand:DI 2 "const_int_operand" "n"))]
+ (match_operand:DI 2 "const_int_operand" "n")
+ (const_int 1))]
""
{
static const char * const alt[2][4] = {
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index e0f0a582732..b5c547806b4 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -7227,10 +7227,25 @@
;;
-(define_insn "prefetch"
+(define_expand "prefetch"
+ [(prefetch (match_operand:QI 0 "address_operand")
+ (match_operand 1 "const_int_operand")
+ (match_operand 2 "const_int_operand")
+ (match_operand 3 "const_int_operand"))]
+ "ISA_HAS_PREFETCH && TARGET_EXPLICIT_RELOCS"
+{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+})
+
+(define_insn "*prefetch"
[(prefetch (match_operand:QI 0 "address_operand" "ZD")
(match_operand 1 "const_int_operand" "n")
- (match_operand 2 "const_int_operand" "n"))]
+ (match_operand 2 "const_int_operand" "n")
+ (const_int 1))]
"ISA_HAS_PREFETCH && TARGET_EXPLICIT_RELOCS"
{
if (TARGET_LOONGSON_2EF || TARGET_LOONGSON_EXT)
@@ -7257,7 +7272,8 @@
[(prefetch (plus:P (match_operand:P 0 "register_operand" "d")
(match_operand:P 1 "register_operand" "d"))
(match_operand 2 "const_int_operand" "n")
- (match_operand 3 "const_int_operand" "n"))]
+ (match_operand 3 "const_int_operand" "n")
+ (const_int 1))]
"ISA_HAS_PREFETCHX && TARGET_HARD_FLOAT && TARGET_DOUBLE_FLOAT"
{
if (TARGET_LOONGSON_EXT)
diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md
index 76ae35d4cfa..a7469074c01 100644
--- a/gcc/config/pa/pa.md
+++ b/gcc/config/pa/pa.md
@@ -10201,9 +10201,16 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
(define_expand "prefetch"
[(match_operand 0 "address_operand" "")
(match_operand 1 "const_int_operand" "")
- (match_operand 2 "const_int_operand" "")]
+ (match_operand 2 "const_int_operand" "")
+ (match_operand 3 "const_int_operand" "")]
"TARGET_PA_20"
{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+
operands[0] = copy_addr_to_reg (operands[0]);
emit_insn (gen_prefetch_20 (operands[0], operands[1], operands[2]));
DONE;
@@ -10212,7 +10219,8 @@ add,l %2,%3,%3\;bv,n %%r0(%3)"
(define_insn "prefetch_20"
[(prefetch (match_operand 0 "pmode_register_operand" "r")
(match_operand:SI 1 "const_int_operand" "n")
- (match_operand:SI 2 "const_int_operand" "n"))]
+ (match_operand:SI 2 "const_int_operand" "n")
+ (const_int 1))]
"TARGET_PA_20"
{
/* The SL cache-control completer indicates good spatial locality but
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index ad5a4cf2ef8..21ff09eca93 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -14060,10 +14060,25 @@
DONE;
})
-(define_insn "prefetch"
+(define_expand "prefetch"
+ [(prefetch (match_operand 0 "indexed_or_indirect_address")
+ (match_operand:SI 1 "const_int_operand")
+ (match_operand:SI 2 "const_int_operand")
+ (match_operand:SI 3 "const_int_operand"))]
+ ""
+{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+})
+
+(define_insn "*prefetch"
[(prefetch (match_operand 0 "indexed_or_indirect_address" "a")
(match_operand:SI 1 "const_int_operand" "n")
- (match_operand:SI 2 "const_int_operand" "n"))]
+ (match_operand:SI 2 "const_int_operand" "n")
+ (const_int 1))]
""
{
diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index ae309471f04..3fc5ae196b8 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -5697,13 +5697,13 @@ s390_expand_cpymem (rtx dst, rtx src, rtx len)
/* Issue a read prefetch for the +3 cache line. */
prefetch = gen_prefetch (gen_rtx_PLUS (Pmode, src_addr, GEN_INT
(768)),
- const0_rtx, const0_rtx);
+ const0_rtx, const0_rtx, const1_rtx);
PREFETCH_SCHEDULE_BARRIER_P (prefetch) = true;
emit_insn (prefetch);
/* Issue a write prefetch for the +3 cache line. */
prefetch = gen_prefetch (gen_rtx_PLUS (Pmode, dst_addr, GEN_INT
(768)),
- const1_rtx, const0_rtx);
+ const1_rtx, const0_rtx, const1_rtx);
PREFETCH_SCHEDULE_BARRIER_P (prefetch) = true;
emit_insn (prefetch);
}
@@ -5872,7 +5872,7 @@ s390_expand_setmem (rtx dst, rtx len, rtx val)
/* Issue a write prefetch. */
rtx distance = GEN_INT (TARGET_SETMEM_PREFETCH_DISTANCE);
rtx prefetch = gen_prefetch (gen_rtx_PLUS (Pmode, dst_addr, distance),
- const1_rtx, const0_rtx);
+ const1_rtx, const0_rtx, const1_rtx);
emit_insn (prefetch);
PREFETCH_SCHEDULE_BARRIER_P (prefetch) = true;
}
@@ -5999,13 +5999,13 @@ s390_expand_cmpmem (rtx target, rtx op0, rtx op1, rtx
len)
/* Issue a read prefetch for the +2 cache line of operand 1. */
prefetch = gen_prefetch (gen_rtx_PLUS (Pmode, addr0, GEN_INT (512)),
- const0_rtx, const0_rtx);
+ const0_rtx, const0_rtx, const1_rtx);
emit_insn (prefetch);
PREFETCH_SCHEDULE_BARRIER_P (prefetch) = true;
/* Issue a read prefetch for the +2 cache line of operand 2. */
prefetch = gen_prefetch (gen_rtx_PLUS (Pmode, addr1, GEN_INT (512)),
- const0_rtx, const0_rtx);
+ const0_rtx, const0_rtx, const1_rtx);
emit_insn (prefetch);
PREFETCH_SCHEDULE_BARRIER_P (prefetch) = true;
}
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 962927c3112..4b094aa2bcf 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -11601,10 +11601,25 @@
; Data prefetch patterns
;
-(define_insn "prefetch"
+(define_expand "prefetch"
+ [(prefetch (match_operand 0 "address_operand")
+ (match_operand:SI 1 "const_int_operand")
+ (match_operand:SI 2 "const_int_operand")
+ (match_operand:SI 3 "const_int_operand"))]
+ "TARGET_Z10"
+{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+})
+
+(define_insn "*prefetch"
[(prefetch (match_operand 0 "address_operand" "ZT,X")
(match_operand:SI 1 "const_int_operand" " n,n")
- (match_operand:SI 2 "const_int_operand" " n,n"))]
+ (match_operand:SI 2 "const_int_operand" " n,n")
+ (const_int 1))]
"TARGET_Z10"
{
switch (which_alternative)
diff --git a/gcc/config/sh/sh.md b/gcc/config/sh/sh.md
index 59a7b216433..54a8270e80e 100644
--- a/gcc/config/sh/sh.md
+++ b/gcc/config/sh/sh.md
@@ -10928,13 +10928,22 @@
(define_expand "prefetch"
[(prefetch (match_operand 0 "address_operand" "")
(match_operand:SI 1 "const_int_operand" "")
- (match_operand:SI 2 "const_int_operand" ""))]
- "(TARGET_SH2A || TARGET_SH3) && !TARGET_VXWORKS_RTP")
+ (match_operand:SI 2 "const_int_operand" "")
+ (match_operand:SI 3 "const_int_operand" ""))]
+ "(TARGET_SH2A || TARGET_SH3) && !TARGET_VXWORKS_RTP"
+{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+})
(define_insn "*prefetch"
[(prefetch (match_operand:SI 0 "register_operand" "r")
(match_operand:SI 1 "const_int_operand" "n")
- (match_operand:SI 2 "const_int_operand" "n"))]
+ (match_operand:SI 2 "const_int_operand" "n")
+ (const_int 1))]
"(TARGET_SH2A || TARGET_SH3) && ! TARGET_VXWORKS_RTP"
"pref @%0"
[(set_attr "type" "other")])
diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index 691e707863a..04cb6935b1b 100644
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -7816,9 +7816,16 @@ visl")
(define_expand "prefetch"
[(match_operand 0 "address_operand" "")
(match_operand 1 "const_int_operand" "")
- (match_operand 2 "const_int_operand" "")]
+ (match_operand 2 "const_int_operand" "")
+ (match_operand 3 "const_int_operand" "")]
"TARGET_V9"
{
+ if (INTVAL (operands[3]) == 0)
+ {
+ warning (0, "instruction prefetch is not supported; using data prefetch");
+ operands[3] = const1_rtx;
+ }
+
if (TARGET_ARCH64)
emit_insn (gen_prefetch_64 (operands[0], operands[1], operands[2]));
else
@@ -7829,7 +7836,8 @@ visl")
(define_insn "prefetch_64"
[(prefetch (match_operand:DI 0 "address_operand" "p")
(match_operand:DI 1 "const_int_operand" "n")
- (match_operand:DI 2 "const_int_operand" "n"))]
+ (match_operand:DI 2 "const_int_operand" "n")
+ (const_int 1))]
""
{
static const char * const prefetch_instr[2][2] = {
@@ -7855,7 +7863,8 @@ visl")
(define_insn "prefetch_32"
[(prefetch (match_operand:SI 0 "address_operand" "p")
(match_operand:SI 1 "const_int_operand" "n")
- (match_operand:SI 2 "const_int_operand" "n"))]
+ (match_operand:SI 2 "const_int_operand" "n")
+ (const_int 1))]
""
{
static const char * const prefetch_instr[2][2] = {
diff --git a/gcc/doc/rtl.texi b/gcc/doc/rtl.texi
index 43c9ee8bffe..592f4b0e4dd 100644
--- a/gcc/doc/rtl.texi
+++ b/gcc/doc/rtl.texi
@@ -3454,7 +3454,7 @@ position of @var{base}, @var{min} and @var{max} to the
containing insn
and of @var{min} and @var{max} to @var{base}. See rtl.def for details.
@findex prefetch
-@item (prefetch:@var{m} @var{addr} @var{rw} @var{locality})
+@item (prefetch:@var{m} @var{addr} @var{rw} @var{locality} @var{cache})
Represents prefetch of memory at address @var{addr}.
Operand @var{rw} is 1 if the prefetch is for data to be written, 0 otherwise;
targets that do not support write prefetches should treat this as a normal
@@ -3462,6 +3462,10 @@ prefetch.
Operand @var{locality} specifies the amount of temporal locality; 0 if there
is none or 1, 2, or 3 for increasing levels of temporal locality;
targets that do not support locality hints should ignore this.
+Operand @var{cache} is 1 if the prefetch is prefetching data, 0 for prefetching
+instruction;
+targets that do not support instruction prefetch should treat all as data
+prefetch.
This insn is used to minimize cache-miss latency by moving data into a
cache before it is accessed. It should use only non-faulting data prefetch
diff --git a/gcc/rtl.def b/gcc/rtl.def
index 08e31fa3544..f2e37d55023 100644
--- a/gcc/rtl.def
+++ b/gcc/rtl.def
@@ -277,10 +277,11 @@ DEF_RTL_EXPR(ADDR_DIFF_VEC, "addr_diff_vec", "eEee0",
RTX_EXTRA)
Operand 3 is the level of temporal locality; 0 means there is no
temporal locality and 1, 2, and 3 are for increasing levels of temporal
locality.
+ Operand 4 is 1 for prefetch data, 0 for prefetch instrction.
- The attributes specified by operands 2 and 3 are ignored for targets
+ The attributes specified by operands 2, 3 and 4 are ignored for targets
whose prefetch instructions do not support them. */
-DEF_RTL_EXPR(PREFETCH, "prefetch", "eee", RTX_EXTRA)
+DEF_RTL_EXPR(PREFETCH, "prefetch", "eeee", RTX_EXTRA)
/* ----------------------------------------------------------------------
At the top level of an instruction (perhaps under PARALLEL).
diff --git a/gcc/rtlanal.cc b/gcc/rtlanal.cc
index 56da7435a28..7eeef285f1e 100644
--- a/gcc/rtlanal.cc
+++ b/gcc/rtlanal.cc
@@ -6196,7 +6196,7 @@ setup_reg_subrtx_bounds (unsigned int code)
while (format[i] == 'e');
rtx_all_subrtx_bounds[code].count = i - rtx_all_subrtx_bounds[code].start;
/* rtl-iter.h relies on this. */
- gcc_checking_assert (rtx_all_subrtx_bounds[code].count <= 3);
+ gcc_checking_assert (rtx_all_subrtx_bounds[code].count <= 4);
for (; format[i]; ++i)
if (format[i] == 'E' || format[i] == 'V' || format[i] == 'e')
diff --git a/gcc/target-insns.def b/gcc/target-insns.def
index de8c0092f98..ca13d1c4393 100644
--- a/gcc/target-insns.def
+++ b/gcc/target-insns.def
@@ -76,7 +76,7 @@ DEF_TARGET_INSN (omp_simt_ordered, (rtx x0, rtx x1))
DEF_TARGET_INSN (omp_simt_vote_any, (rtx x0, rtx x1))
DEF_TARGET_INSN (omp_simt_xchg_bfly, (rtx x0, rtx x1, rtx x2))
DEF_TARGET_INSN (omp_simt_xchg_idx, (rtx x0, rtx x1, rtx x2))
-DEF_TARGET_INSN (prefetch, (rtx x0, rtx x1, rtx x2))
+DEF_TARGET_INSN (prefetch, (rtx x0, rtx x1, rtx x2, rtx x3))
DEF_TARGET_INSN (probe_stack, (rtx x0))
DEF_TARGET_INSN (probe_stack_address, (rtx x0))
DEF_TARGET_INSN (prologue, (void))
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-1.c
b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-1.c
index 4ee05a94d9f..ccc5fab15e5 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-1.c
@@ -1,57 +1,62 @@
/* Test that __builtin_prefetch does no harm.
- Prefetch using all valid combinations of rw and locality values.
+ Prefetch using all valid combinations of cache, rw and locality values.
These must be compile-time constants. */
#define NO_TEMPORAL_LOCALITY 0
#define LOW_TEMPORAL_LOCALITY 1
-#define MODERATE_TEMPORAL_LOCALITY 1
+#define MODERATE_TEMPORAL_LOCALITY 2
#define HIGH_TEMPORAL_LOCALITY 3
#define WRITE_ACCESS 1
#define READ_ACCESS 0
+#define DATA_PRFCH 1
+#define INST_PRFCH 0
+
enum locality { none, low, moderate, high };
enum rw { read, write };
+enum cache { inst, data };
int arr[10];
void
good_const (const int *p)
{
- __builtin_prefetch (p, 0, 0);
- __builtin_prefetch (p, 0, 1);
- __builtin_prefetch (p, 0, 2);
- __builtin_prefetch (p, READ_ACCESS, 3);
- __builtin_prefetch (p, 1, NO_TEMPORAL_LOCALITY);
- __builtin_prefetch (p, 1, LOW_TEMPORAL_LOCALITY);
- __builtin_prefetch (p, 1, MODERATE_TEMPORAL_LOCALITY);
- __builtin_prefetch (p, WRITE_ACCESS, HIGH_TEMPORAL_LOCALITY);
+ __builtin_prefetch (p, 0, 0, 1);
+ __builtin_prefetch (p, 0, 1, 1);
+ __builtin_prefetch (p, 0, 2, 1);
+ __builtin_prefetch (p, READ_ACCESS, 3, 1);
+ __builtin_prefetch (p, 1, NO_TEMPORAL_LOCALITY, 1);
+ __builtin_prefetch (p, 1, LOW_TEMPORAL_LOCALITY, 1);
+ __builtin_prefetch (p, 1, MODERATE_TEMPORAL_LOCALITY, 1);
+ __builtin_prefetch (p, WRITE_ACCESS, HIGH_TEMPORAL_LOCALITY, DATA_PRFCH);
}
void
good_enum (const int *p)
{
- __builtin_prefetch (p, read, none);
- __builtin_prefetch (p, read, low);
- __builtin_prefetch (p, read, moderate);
- __builtin_prefetch (p, read, high);
- __builtin_prefetch (p, write, none);
- __builtin_prefetch (p, write, low);
- __builtin_prefetch (p, write, moderate);
- __builtin_prefetch (p, write, high);
+ __builtin_prefetch (p, read, none, data);
+ __builtin_prefetch (p, read, low, data);
+ __builtin_prefetch (p, read, moderate, data);
+ __builtin_prefetch (p, read, high, data);
+ __builtin_prefetch (p, write, none, data);
+ __builtin_prefetch (p, write, low, data);
+ __builtin_prefetch (p, write, moderate, data);
+ __builtin_prefetch (p, write, high, data);
}
void
good_expr (const int *p)
{
- __builtin_prefetch (p, 1 - 1, 6 - (2 * 3));
- __builtin_prefetch (p, 1 + 0, 1 + 2);
+ __builtin_prefetch (p, 1 - 1, 6 - (2 * 3), 1 + 0);
+ __builtin_prefetch (p, 1 + 0, 1 + 2, 0 + 1);
}
void
good_vararg (const int *p)
{
+ __builtin_prefetch (p, 0, 3, 1);
__builtin_prefetch (p, 0, 3);
__builtin_prefetch (p, 0);
__builtin_prefetch (p, 1);
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-2.c
b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-2.c
index 530a1b0ef0d..6aff1f281e0 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-2.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-2.c
@@ -26,9 +26,9 @@ struct S *ptr_str = &str;
void
simple_global ()
{
- __builtin_prefetch (glob_int_arr, 0, 0);
- __builtin_prefetch (glob_ptr_int, 0, 0);
- __builtin_prefetch (&glob_int, 0, 0);
+ __builtin_prefetch (glob_int_arr, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_int, 0, 0, 1);
+ __builtin_prefetch (&glob_int, 0, 0, 1);
}
/* Prefetch file-level static variables using the address of the variable. */
@@ -36,9 +36,9 @@ simple_global ()
void
simple_file ()
{
- __builtin_prefetch (stat_int_arr, 0, 0);
- __builtin_prefetch (stat_ptr_int, 0, 0);
- __builtin_prefetch (&stat_int, 0, 0);
+ __builtin_prefetch (stat_int_arr, 0, 0, 1);
+ __builtin_prefetch (stat_ptr_int, 0, 0, 1);
+ __builtin_prefetch (&stat_int, 0, 0, 1);
}
/* Prefetch local static variables using the address of the variable. */
@@ -49,9 +49,9 @@ simple_static_local ()
static int gx[100];
static int *hx = gx;
static int ix;
- __builtin_prefetch (gx, 0, 0);
- __builtin_prefetch (hx, 0, 0);
- __builtin_prefetch (&ix, 0, 0);
+ __builtin_prefetch (gx, 0, 0, 1);
+ __builtin_prefetch (hx, 0, 0, 1);
+ __builtin_prefetch (&ix, 0, 0, 1);
}
/* Prefetch local stack variables using the address of the variable. */
@@ -62,9 +62,9 @@ simple_local ()
int gx[100];
int *hx = gx;
int ix;
- __builtin_prefetch (gx, 0, 0);
- __builtin_prefetch (hx, 0, 0);
- __builtin_prefetch (&ix, 0, 0);
+ __builtin_prefetch (gx, 0, 0, 1);
+ __builtin_prefetch (hx, 0, 0, 1);
+ __builtin_prefetch (&ix, 0, 0, 1);
}
/* Prefetch arguments using the address of the variable. */
@@ -72,9 +72,9 @@ simple_local ()
void
simple_arg (int g[100], int *h, int i)
{
- __builtin_prefetch (g, 0, 0);
- __builtin_prefetch (h, 0, 0);
- __builtin_prefetch (&i, 0, 0);
+ __builtin_prefetch (g, 0, 0, 1);
+ __builtin_prefetch (h, 0, 0, 1);
+ __builtin_prefetch (&i, 0, 0, 1);
}
/* Prefetch using address expressions involving global variables. */
@@ -82,25 +82,25 @@ simple_arg (int g[100], int *h, int i)
void
expr_global (void)
{
- __builtin_prefetch (&str, 0, 0);
- __builtin_prefetch (ptr_str, 0, 0);
- __builtin_prefetch (&str.b, 0, 0);
- __builtin_prefetch (&ptr_str->b, 0, 0);
- __builtin_prefetch (&str.d, 0, 0);
- __builtin_prefetch (&ptr_str->d, 0, 0);
- __builtin_prefetch (str.next, 0, 0);
- __builtin_prefetch (ptr_str->next, 0, 0);
- __builtin_prefetch (str.next->d, 0, 0);
- __builtin_prefetch (ptr_str->next->d, 0, 0);
-
- __builtin_prefetch (&glob_int_arr, 0, 0);
- __builtin_prefetch (glob_ptr_int, 0, 0);
- __builtin_prefetch (&glob_int_arr[2], 0, 0);
- __builtin_prefetch (&glob_ptr_int[3], 0, 0);
- __builtin_prefetch (glob_int_arr+3, 0, 0);
- __builtin_prefetch (glob_int_arr+glob_int, 0, 0);
- __builtin_prefetch (glob_ptr_int+5, 0, 0);
- __builtin_prefetch (glob_ptr_int+glob_int, 0, 0);
+ __builtin_prefetch (&str, 0, 0, 1);
+ __builtin_prefetch (ptr_str, 0, 0, 1);
+ __builtin_prefetch (&str.b, 0, 0, 1);
+ __builtin_prefetch (&ptr_str->b, 0, 0, 1);
+ __builtin_prefetch (&str.d, 0, 0, 1);
+ __builtin_prefetch (&ptr_str->d, 0, 0, 1);
+ __builtin_prefetch (str.next, 0, 0, 1);
+ __builtin_prefetch (ptr_str->next, 0, 0, 1);
+ __builtin_prefetch (str.next->d, 0, 0, 1);
+ __builtin_prefetch (ptr_str->next->d, 0, 0, 1);
+
+ __builtin_prefetch (&glob_int_arr, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_int, 0, 0, 1);
+ __builtin_prefetch (&glob_int_arr[2], 0, 0, 1);
+ __builtin_prefetch (&glob_ptr_int[3], 0, 0, 1);
+ __builtin_prefetch (glob_int_arr+3, 0, 0, 1);
+ __builtin_prefetch (glob_int_arr+glob_int, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_int+5, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_int+glob_int, 0, 0, 1);
}
/* Prefetch using address expressions involving local variables. */
@@ -114,25 +114,25 @@ expr_local (void)
struct S *pt = &t;
int j = 4;
- __builtin_prefetch (&t, 0, 0);
- __builtin_prefetch (pt, 0, 0);
- __builtin_prefetch (&t.b, 0, 0);
- __builtin_prefetch (&pt->b, 0, 0);
- __builtin_prefetch (&t.d, 0, 0);
- __builtin_prefetch (&pt->d, 0, 0);
- __builtin_prefetch (t.next, 0, 0);
- __builtin_prefetch (pt->next, 0, 0);
- __builtin_prefetch (t.next->d, 0, 0);
- __builtin_prefetch (pt->next->d, 0, 0);
-
- __builtin_prefetch (&b, 0, 0);
- __builtin_prefetch (pb, 0, 0);
- __builtin_prefetch (&b[2], 0, 0);
- __builtin_prefetch (&pb[3], 0, 0);
- __builtin_prefetch (b+3, 0, 0);
- __builtin_prefetch (b+j, 0, 0);
- __builtin_prefetch (pb+5, 0, 0);
- __builtin_prefetch (pb+j, 0, 0);
+ __builtin_prefetch (&t, 0, 0, 1);
+ __builtin_prefetch (pt, 0, 0, 1);
+ __builtin_prefetch (&t.b, 0, 0, 1);
+ __builtin_prefetch (&pt->b, 0, 0, 1);
+ __builtin_prefetch (&t.d, 0, 0, 1);
+ __builtin_prefetch (&pt->d, 0, 0, 1);
+ __builtin_prefetch (t.next, 0, 0, 1);
+ __builtin_prefetch (pt->next, 0, 0, 1);
+ __builtin_prefetch (t.next->d, 0, 0, 1);
+ __builtin_prefetch (pt->next->d, 0, 0, 1);
+
+ __builtin_prefetch (&b, 0, 0, 1);
+ __builtin_prefetch (pb, 0, 0, 1);
+ __builtin_prefetch (&b[2], 0, 0, 1);
+ __builtin_prefetch (&pb[3], 0, 0, 1);
+ __builtin_prefetch (b+3, 0, 0, 1);
+ __builtin_prefetch (b+j, 0, 0, 1);
+ __builtin_prefetch (pb+5, 0, 0, 1);
+ __builtin_prefetch (pb+j, 0, 0, 1);
}
int
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-3.c
b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-3.c
index 2e2e808c172..38ce410384a 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-3.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-3.c
@@ -36,11 +36,11 @@ volatile struct S * volatile vol_ptr_vol_str = &vol_str;
void
simple_vol_global ()
{
- __builtin_prefetch (glob_vol_int_arr, 0, 0);
- __builtin_prefetch (glob_vol_ptr_int, 0, 0);
- __builtin_prefetch (glob_ptr_vol_int, 0, 0);
- __builtin_prefetch (glob_vol_ptr_vol_int, 0, 0);
- __builtin_prefetch (&glob_vol_int, 0, 0);
+ __builtin_prefetch (glob_vol_int_arr, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_int, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_vol_int, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_vol_int, 0, 0, 1);
+ __builtin_prefetch (&glob_vol_int, 0, 0, 1);
}
/* Prefetch volatile static variables using the address of the variable. */
@@ -48,11 +48,11 @@ simple_vol_global ()
void
simple_vol_file ()
{
- __builtin_prefetch (stat_vol_int_arr, 0, 0);
- __builtin_prefetch (stat_vol_ptr_int, 0, 0);
- __builtin_prefetch (stat_ptr_vol_int, 0, 0);
- __builtin_prefetch (stat_vol_ptr_vol_int, 0, 0);
- __builtin_prefetch (&stat_vol_int, 0, 0);
+ __builtin_prefetch (stat_vol_int_arr, 0, 0, 1);
+ __builtin_prefetch (stat_vol_ptr_int, 0, 0, 1);
+ __builtin_prefetch (stat_ptr_vol_int, 0, 0, 1);
+ __builtin_prefetch (stat_vol_ptr_vol_int, 0, 0, 1);
+ __builtin_prefetch (&stat_vol_int, 0, 0, 1);
}
/* Prefetch using address expressions involving volatile global variables. */
@@ -60,43 +60,43 @@ simple_vol_file ()
void
expr_vol_global (void)
{
- __builtin_prefetch (&vol_str, 0, 0);
- __builtin_prefetch (ptr_vol_str, 0, 0);
- __builtin_prefetch (vol_ptr_str, 0, 0);
- __builtin_prefetch (vol_ptr_vol_str, 0, 0);
- __builtin_prefetch (&vol_str.b, 0, 0);
- __builtin_prefetch (&ptr_vol_str->b, 0, 0);
- __builtin_prefetch (&vol_ptr_str->b, 0, 0);
- __builtin_prefetch (&vol_ptr_vol_str->b, 0, 0);
- __builtin_prefetch (&vol_str.d, 0, 0);
- __builtin_prefetch (&vol_ptr_str->d, 0, 0);
- __builtin_prefetch (&ptr_vol_str->d, 0, 0);
- __builtin_prefetch (&vol_ptr_vol_str->d, 0, 0);
- __builtin_prefetch (vol_str.next, 0, 0);
- __builtin_prefetch (vol_ptr_str->next, 0, 0);
- __builtin_prefetch (ptr_vol_str->next, 0, 0);
- __builtin_prefetch (vol_ptr_vol_str->next, 0, 0);
- __builtin_prefetch (vol_str.next->d, 0, 0);
- __builtin_prefetch (vol_ptr_str->next->d, 0, 0);
- __builtin_prefetch (ptr_vol_str->next->d, 0, 0);
- __builtin_prefetch (vol_ptr_vol_str->next->d, 0, 0);
+ __builtin_prefetch (&vol_str, 0, 0, 1);
+ __builtin_prefetch (ptr_vol_str, 0, 0, 1);
+ __builtin_prefetch (vol_ptr_str, 0, 0, 1);
+ __builtin_prefetch (vol_ptr_vol_str, 0, 0, 1);
+ __builtin_prefetch (&vol_str.b, 0, 0, 1);
+ __builtin_prefetch (&ptr_vol_str->b, 0, 0, 1);
+ __builtin_prefetch (&vol_ptr_str->b, 0, 0, 1);
+ __builtin_prefetch (&vol_ptr_vol_str->b, 0, 0, 1);
+ __builtin_prefetch (&vol_str.d, 0, 0, 1);
+ __builtin_prefetch (&vol_ptr_str->d, 0, 0, 1);
+ __builtin_prefetch (&ptr_vol_str->d, 0, 0, 1);
+ __builtin_prefetch (&vol_ptr_vol_str->d, 0, 0, 1);
+ __builtin_prefetch (vol_str.next, 0, 0, 1);
+ __builtin_prefetch (vol_ptr_str->next, 0, 0, 1);
+ __builtin_prefetch (ptr_vol_str->next, 0, 0, 1);
+ __builtin_prefetch (vol_ptr_vol_str->next, 0, 0, 1);
+ __builtin_prefetch (vol_str.next->d, 0, 0, 1);
+ __builtin_prefetch (vol_ptr_str->next->d, 0, 0, 1);
+ __builtin_prefetch (ptr_vol_str->next->d, 0, 0, 1);
+ __builtin_prefetch (vol_ptr_vol_str->next->d, 0, 0, 1);
- __builtin_prefetch (&glob_vol_int_arr, 0, 0);
- __builtin_prefetch (glob_vol_ptr_int, 0, 0);
- __builtin_prefetch (glob_ptr_vol_int, 0, 0);
- __builtin_prefetch (glob_vol_ptr_vol_int, 0, 0);
- __builtin_prefetch (&glob_vol_int_arr[2], 0, 0);
- __builtin_prefetch (&glob_vol_ptr_int[3], 0, 0);
- __builtin_prefetch (&glob_ptr_vol_int[3], 0, 0);
- __builtin_prefetch (&glob_vol_ptr_vol_int[3], 0, 0);
- __builtin_prefetch (glob_vol_int_arr+3, 0, 0);
- __builtin_prefetch (glob_vol_int_arr+glob_vol_int, 0, 0);
- __builtin_prefetch (glob_vol_ptr_int+5, 0, 0);
- __builtin_prefetch (glob_ptr_vol_int+5, 0, 0);
- __builtin_prefetch (glob_vol_ptr_vol_int+5, 0, 0);
- __builtin_prefetch (glob_vol_ptr_int+glob_vol_int, 0, 0);
- __builtin_prefetch (glob_ptr_vol_int+glob_vol_int, 0, 0);
- __builtin_prefetch (glob_vol_ptr_vol_int+glob_vol_int, 0, 0);
+ __builtin_prefetch (&glob_vol_int_arr, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_int, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_vol_int, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_vol_int, 0, 0, 1);
+ __builtin_prefetch (&glob_vol_int_arr[2], 0, 0, 1);
+ __builtin_prefetch (&glob_vol_ptr_int[3], 0, 0, 1);
+ __builtin_prefetch (&glob_ptr_vol_int[3], 0, 0, 1);
+ __builtin_prefetch (&glob_vol_ptr_vol_int[3], 0, 0, 1);
+ __builtin_prefetch (glob_vol_int_arr+3, 0, 0, 1);
+ __builtin_prefetch (glob_vol_int_arr+glob_vol_int, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_int+5, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_vol_int+5, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_vol_int+5, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_int+glob_vol_int, 0, 0, 1);
+ __builtin_prefetch (glob_ptr_vol_int+glob_vol_int, 0, 0, 1);
+ __builtin_prefetch (glob_vol_ptr_vol_int+glob_vol_int, 0, 0, 1);
}
int
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-4.c
b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-4.c
index ade892b21a7..69b4cbe1854 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-4.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-4.c
@@ -17,7 +17,7 @@ int
assign_arg_ptr (int *p)
{
int *q;
- __builtin_prefetch ((q = p), 0, 0);
+ __builtin_prefetch ((q = p), 0, 0, 1);
return q == p;
}
@@ -25,7 +25,7 @@ int
assign_glob_ptr (void)
{
int *q;
- __builtin_prefetch ((q = ptr), 0, 0);
+ __builtin_prefetch ((q = ptr), 0, 0, 1);
return q == ptr;
}
@@ -33,7 +33,7 @@ int
assign_arg_idx (int *p, int i)
{
int j;
- __builtin_prefetch (&p[j = i], 0, 0);
+ __builtin_prefetch (&p[j = i], 0, 0, 1);
return j == i;
}
@@ -41,7 +41,7 @@ int
assign_glob_idx (void)
{
int j;
- __builtin_prefetch (&ptr[j = arrindex], 0, 0);
+ __builtin_prefetch (&ptr[j = arrindex], 0, 0, 1);
return j == arrindex;
}
@@ -53,7 +53,7 @@ preinc_arg_ptr (int *p)
{
int *q;
q = p + 1;
- __builtin_prefetch (++p, 0, 0);
+ __builtin_prefetch (++p, 0, 0, 1);
return p == q;
}
@@ -62,7 +62,7 @@ preinc_glob_ptr (void)
{
int *q;
q = ptr + 1;
- __builtin_prefetch (++ptr, 0, 0);
+ __builtin_prefetch (++ptr, 0, 0, 1);
return ptr == q;
}
@@ -71,7 +71,7 @@ postinc_arg_ptr (int *p)
{
int *q;
q = p + 1;
- __builtin_prefetch (p++, 0, 0);
+ __builtin_prefetch (p++, 0, 0, 1);
return p == q;
}
@@ -80,7 +80,7 @@ postinc_glob_ptr (void)
{
int *q;
q = ptr + 1;
- __builtin_prefetch (ptr++, 0, 0);
+ __builtin_prefetch (ptr++, 0, 0, 1);
return ptr == q;
}
@@ -89,7 +89,7 @@ predec_arg_ptr (int *p)
{
int *q;
q = p - 1;
- __builtin_prefetch (--p, 0, 0);
+ __builtin_prefetch (--p, 0, 0, 1);
return p == q;
}
@@ -98,7 +98,7 @@ predec_glob_ptr (void)
{
int *q;
q = ptr - 1;
- __builtin_prefetch (--ptr, 0, 0);
+ __builtin_prefetch (--ptr, 0, 0, 1);
return ptr == q;
}
@@ -107,7 +107,7 @@ postdec_arg_ptr (int *p)
{
int *q;
q = p - 1;
- __builtin_prefetch (p--, 0, 0);
+ __builtin_prefetch (p--, 0, 0, 1);
return p == q;
}
@@ -116,7 +116,7 @@ postdec_glob_ptr (void)
{
int *q;
q = ptr - 1;
- __builtin_prefetch (ptr--, 0, 0);
+ __builtin_prefetch (ptr--, 0, 0, 1);
return ptr == q;
}
@@ -124,7 +124,7 @@ int
preinc_arg_idx (int *p, int i)
{
int j = i + 1;
- __builtin_prefetch (&p[++i], 0, 0);
+ __builtin_prefetch (&p[++i], 0, 0, 1);
return i == j;
}
@@ -133,7 +133,7 @@ int
preinc_glob_idx (void)
{
int j = arrindex + 1;
- __builtin_prefetch (&ptr[++arrindex], 0, 0);
+ __builtin_prefetch (&ptr[++arrindex], 0, 0, 1);
return arrindex == j;
}
@@ -141,7 +141,7 @@ int
postinc_arg_idx (int *p, int i)
{
int j = i + 1;
- __builtin_prefetch (&p[i++], 0, 0);
+ __builtin_prefetch (&p[i++], 0, 0, 1);
return i == j;
}
@@ -149,7 +149,7 @@ int
postinc_glob_idx (void)
{
int j = arrindex + 1;
- __builtin_prefetch (&ptr[arrindex++], 0, 0);
+ __builtin_prefetch (&ptr[arrindex++], 0, 0, 1);
return arrindex == j;
}
@@ -157,7 +157,7 @@ int
predec_arg_idx (int *p, int i)
{
int j = i - 1;
- __builtin_prefetch (&p[--i], 0, 0);
+ __builtin_prefetch (&p[--i], 0, 0, 1);
return i == j;
}
@@ -165,7 +165,7 @@ int
predec_glob_idx (void)
{
int j = arrindex - 1;
- __builtin_prefetch (&ptr[--arrindex], 0, 0);
+ __builtin_prefetch (&ptr[--arrindex], 0, 0, 1);
return arrindex == j;
}
@@ -173,7 +173,7 @@ int
postdec_arg_idx (int *p, int i)
{
int j = i - 1;
- __builtin_prefetch (&p[i--], 0, 0);
+ __builtin_prefetch (&p[i--], 0, 0, 1);
return i == j;
}
@@ -181,7 +181,7 @@ int
postdec_glob_idx (void)
{
int j = arrindex - 1;
- __builtin_prefetch (&ptr[arrindex--], 0, 0);
+ __builtin_prefetch (&ptr[arrindex--], 0, 0, 1);
return arrindex == j;
}
@@ -200,7 +200,7 @@ getptr (int *p)
int
funccall_arg_ptr (int *p)
{
- __builtin_prefetch (getptr (p), 0, 0);
+ __builtin_prefetch (getptr (p), 0, 0, 1);
return getptrcnt == 1;
}
@@ -216,7 +216,7 @@ getint (int i)
int
funccall_arg_idx (int *p, int i)
{
- __builtin_prefetch (&p[getint (i)], 0, 0);
+ __builtin_prefetch (&p[getint (i)], 0, 0, 1);
return getintcnt == 1;
}
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-5.c b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-5.c
index f42a2c0ca87..a6fa1741888 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-5.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-5.c
@@ -18,32 +18,32 @@ int idx = 3;
void
arg_ptr (char *p)
{
- __builtin_prefetch (p, 0, 0);
+ __builtin_prefetch (p, 0, 0, 1);
}
void
arg_idx (char *p, int i)
{
- __builtin_prefetch (&p[i], 0, 0);
+ __builtin_prefetch (&p[i], 0, 0, 1);
}
void
glob_ptr (void)
{
- __builtin_prefetch (ptr, 0, 0);
+ __builtin_prefetch (ptr, 0, 0, 1);
}
void
glob_idx (void)
{
- __builtin_prefetch (&ptr[idx], 0, 0);
+ __builtin_prefetch (&ptr[idx], 0, 0, 1);
}
int
main ()
{
- __builtin_prefetch (&s.b, 0, 0);
- __builtin_prefetch (&s.c[1], 0, 0);
+ __builtin_prefetch (&s.b, 0, 0, 1);
+ __builtin_prefetch (&s.c[1], 0, 0, 1);
arg_ptr (&s.c[1]);
arg_ptr (ptr+3);
diff --git a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-6.c
b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-6.c
index f643c5c7286..fabecaf56dc 100644
--- a/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-6.c
+++ b/gcc/testsuite/gcc.c-torture/execute/builtin-prefetch-6.c
@@ -25,7 +25,7 @@ prefetch_for_read (void)
{
int i;
for (i = 0; i < ARRSIZE; i++)
- __builtin_prefetch (bad_addr[i], 0, 0);
+ __builtin_prefetch (bad_addr[i], 0, 0, 1);
}
void
@@ -33,7 +33,7 @@ prefetch_for_write (void)
{
int i;
for (i = 0; i < ARRSIZE; i++)
- __builtin_prefetch (bad_addr[i], 1, 0);
+ __builtin_prefetch (bad_addr[i], 1, 0, 1);
}
int
diff --git a/gcc/testsuite/gcc.dg/builtin-prefetch-1.c
b/gcc/testsuite/gcc.dg/builtin-prefetch-1.c
index 11beb4e1bbe..84d564dc72c 100644
--- a/gcc/testsuite/gcc.dg/builtin-prefetch-1.c
+++ b/gcc/testsuite/gcc.dg/builtin-prefetch-1.c
@@ -1,6 +1,6 @@
/* Test that __builtin_prefetch does no harm.
- Prefetch using some invalid rw and locality values. These must be
+ Prefetch using some invalid cache, rw and locality values. These must be
compile-time constants. */
/* { dg-do run } */
@@ -9,6 +9,7 @@ extern void exit (int);
enum locality { none, low, moderate, high, bogus };
enum rw { read, write };
+enum cache { inst, data };
int arr[10];
@@ -34,6 +35,8 @@ bad (int *p)
__builtin_prefetch (p, 0, -1); /* { dg-warning "invalid third argument to
'__builtin_prefetch'; using zero" } */
__builtin_prefetch (p, 0, 4); /* { dg-warning "invalid third argument to
'__builtin_prefetch'; using zero" } */
__builtin_prefetch (p, 0, bogus); /* { dg-warning "invalid third argument to
'__builtin_prefetch'; using zero" } */
+ __builtin_prefetch (p, 0, 3, -1); /* { dg-warning "invalid fourth argument to
'__builtin_prefetch'; using one" } */
+ __builtin_prefetch (p, 0, 3, bogus); /* { dg-warning "invalid fourth argument
to '__builtin_prefetch'; using one" } */
}
int
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
index 638749a5a68..eb9197b357c 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-3dnow-1.c
@@ -9,14 +9,14 @@ char *msg = "howdy there";
void foo (char *p)
{
- __builtin_prefetch (p, 0, 0);
- __builtin_prefetch (p, 0, 1);
- __builtin_prefetch (p, 0, 2);
- __builtin_prefetch (p, 0, 3);
- __builtin_prefetch (p, 1, 0);
- __builtin_prefetch (p, 1, 1);
- __builtin_prefetch (p, 1, 2);
- __builtin_prefetch (p, 1, 3);
+ __builtin_prefetch (p, 0, 0, 1);
+ __builtin_prefetch (p, 0, 1, 1);
+ __builtin_prefetch (p, 0, 2, 1);
+ __builtin_prefetch (p, 0, 3, 1);
+ __builtin_prefetch (p, 1, 0, 1);
+ __builtin_prefetch (p, 1, 1, 1);
+ __builtin_prefetch (p, 1, 2, 1);
+ __builtin_prefetch (p, 1, 3, 1);
}
int main ()
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
index d793437f175..b5081815f7a 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-athlon-1.c
@@ -10,14 +10,14 @@ char *msg = "howdy there";
void foo (char *p)
{
- __builtin_prefetch (p, 0, 0);
- __builtin_prefetch (p, 0, 1);
- __builtin_prefetch (p, 0, 2);
- __builtin_prefetch (p, 0, 3);
- __builtin_prefetch (p, 1, 0);
- __builtin_prefetch (p, 1, 1);
- __builtin_prefetch (p, 1, 2);
- __builtin_prefetch (p, 1, 3);
+ __builtin_prefetch (p, 0, 0, 1);
+ __builtin_prefetch (p, 0, 1, 1);
+ __builtin_prefetch (p, 0, 2, 1);
+ __builtin_prefetch (p, 0, 3, 1);
+ __builtin_prefetch (p, 1, 0, 1);
+ __builtin_prefetch (p, 1, 1, 1);
+ __builtin_prefetch (p, 1, 2, 1);
+ __builtin_prefetch (p, 1, 3, 1);
}
int main ()
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
index 04e814d5a9c..2317f665107 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-none-1.c
@@ -9,14 +9,14 @@ char *msg = "howdy there";
void foo (char *p)
{
- __builtin_prefetch (p, 0, 0);
- __builtin_prefetch (p, 0, 1);
- __builtin_prefetch (p, 0, 2);
- __builtin_prefetch (p, 0, 3);
- __builtin_prefetch (p, 1, 0);
- __builtin_prefetch (p, 1, 1);
- __builtin_prefetch (p, 1, 2);
- __builtin_prefetch (p, 1, 3);
+ __builtin_prefetch (p, 0, 0, 1);
+ __builtin_prefetch (p, 0, 1, 1);
+ __builtin_prefetch (p, 0, 2, 1);
+ __builtin_prefetch (p, 0, 3, 1);
+ __builtin_prefetch (p, 1, 0, 1);
+ __builtin_prefetch (p, 1, 1, 1);
+ __builtin_prefetch (p, 1, 2, 1);
+ __builtin_prefetch (p, 1, 3, 1);
}
int main ()
diff --git a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
index 3707c7074be..936ad9e79ad 100644
--- a/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
+++ b/gcc/testsuite/gcc.misc-tests/i386-pf-sse-1.c
@@ -9,14 +9,14 @@ char *msg = "howdy there";
void foo (char *p)
{
- __builtin_prefetch (p, 0, 0);
- __builtin_prefetch (p, 0, 1);
- __builtin_prefetch (p, 0, 2);
- __builtin_prefetch (p, 0, 3);
- __builtin_prefetch (p, 1, 0);
- __builtin_prefetch (p, 1, 1);
- __builtin_prefetch (p, 1, 2);
- __builtin_prefetch (p, 1, 3);
+ __builtin_prefetch (p, 0, 0, 1);
+ __builtin_prefetch (p, 0, 1, 1);
+ __builtin_prefetch (p, 0, 2, 1);
+ __builtin_prefetch (p, 0, 3, 1);
+ __builtin_prefetch (p, 1, 0, 1);
+ __builtin_prefetch (p, 1, 1, 1);
+ __builtin_prefetch (p, 1, 2, 1);
+ __builtin_prefetch (p, 1, 3, 1);
}
int main ()
diff --git a/gcc/testsuite/gcc.target/aarch64/prefetchi-1.c
b/gcc/testsuite/gcc.target/aarch64/prefetchi-1.c
new file mode 100644
index 00000000000..f082396ac2e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/alpha/prefetchi-1.c
b/gcc/testsuite/gcc.target/alpha/prefetchi-1.c
new file mode 100644
index 00000000000..5d9c387e260
--- /dev/null
+++ b/gcc/testsuite/gcc.target/alpha/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mcpu=ev6" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/arc/prefetchi-1.c
b/gcc/testsuite/gcc.target/arc/prefetchi-1.c
new file mode 100644
index 00000000000..7e023ab6498
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arc/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mcpu=archs" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/arm/prefetchi-1.c
b/gcc/testsuite/gcc.target/arm/prefetchi-1.c
new file mode 100644
index 00000000000..0fbcb7019bc
--- /dev/null
+++ b/gcc/testsuite/gcc.target/arm/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile { target { ia32 } } } */
+/* { dg-options "-O2 -march=armv5te" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/hppa/prefetchi-1.c
b/gcc/testsuite/gcc.target/hppa/prefetchi-1.c
new file mode 100644
index 00000000000..26854a6828d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/hppa/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mpa-risc-2-0" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/i386/avx-1.c
b/gcc/testsuite/gcc.target/i386/avx-1.c
index 051a1b59b5b..ea0b9f6bcef 100644
--- a/gcc/testsuite/gcc.target/i386/avx-1.c
+++ b/gcc/testsuite/gcc.target/i386/avx-1.c
@@ -153,7 +153,7 @@
#define __builtin_ia32_shufpd(A, B, N) __builtin_ia32_shufpd(A, B, 0)
/* xmmintrin.h */
-#define __builtin_prefetch(P, A, I) __builtin_prefetch(P, 0, _MM_HINT_NTA)
+#define __builtin_prefetch(P, ...) __builtin_prefetch(P, 0, _MM_HINT_NTA)
#define __builtin_ia32_pshufw(A, N) __builtin_ia32_pshufw(A, 0)
#define __builtin_ia32_vec_set_v4hi(A, D, N) \
__builtin_ia32_vec_set_v4hi(A, D, 0)
diff --git a/gcc/testsuite/gcc.target/i386/prefetchi-1.c
b/gcc/testsuite/gcc.target/i386/prefetchi-1.c
new file mode 100644
index 00000000000..b32d59f2e5f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -msse" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad(const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/i386/sse-13.c
b/gcc/testsuite/gcc.target/i386/sse-13.c
index ca662f7bd47..6c9742cf494 100644
--- a/gcc/testsuite/gcc.target/i386/sse-13.c
+++ b/gcc/testsuite/gcc.target/i386/sse-13.c
@@ -125,7 +125,7 @@
#define __builtin_ia32_shufpd(A, B, N) __builtin_ia32_shufpd(A, B, 0)
/* xmmintrin.h */
-#define __builtin_prefetch(P, A, I) __builtin_prefetch(P, 0, _MM_HINT_NTA)
+#define __builtin_prefetch(P, ...) __builtin_prefetch(P, 0, _MM_HINT_NTA)
#define __builtin_ia32_pshufw(A, N) __builtin_ia32_pshufw(A, 0)
#define __builtin_ia32_vec_set_v4hi(A, D, N) \
__builtin_ia32_vec_set_v4hi(A, D, 0)
diff --git a/gcc/testsuite/gcc.target/i386/sse-23.c
b/gcc/testsuite/gcc.target/i386/sse-23.c
index ba1310f9f89..344913e9a90 100644
--- a/gcc/testsuite/gcc.target/i386/sse-23.c
+++ b/gcc/testsuite/gcc.target/i386/sse-23.c
@@ -94,7 +94,7 @@
#define __builtin_ia32_shufpd(A, B, N) __builtin_ia32_shufpd(A, B, 0)
/* xmmintrin.h */
-#define __builtin_prefetch(P, A, I) __builtin_prefetch(P, 0, _MM_HINT_NTA)
+#define __builtin_prefetch(P, ...) __builtin_prefetch(P, 0, _MM_HINT_NTA)
#define __builtin_ia32_pshufw(A, N) __builtin_ia32_pshufw(A, 0)
#define __builtin_ia32_vec_set_v4hi(A, D, N) \
__builtin_ia32_vec_set_v4hi(A, D, 0)
diff --git a/gcc/testsuite/gcc.target/ia64/prefetchi-1.c
b/gcc/testsuite/gcc.target/ia64/prefetchi-1.c
new file mode 100644
index 00000000000..f082396ac2e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/ia64/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/mips/prefetchi-1.c
b/gcc/testsuite/gcc.target/mips/prefetchi-1.c
new file mode 100644
index 00000000000..23e78a0c7ba
--- /dev/null
+++ b/gcc/testsuite/gcc.target/mips/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-mips4 -mexplicit-relocs" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/powerpc/prefetchi-1.c
b/gcc/testsuite/gcc.target/powerpc/prefetchi-1.c
new file mode 100644
index 00000000000..f082396ac2e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/s390/prefetchi-1.c
b/gcc/testsuite/gcc.target/s390/prefetchi-1.c
new file mode 100644
index 00000000000..5ef557f1d8c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mzarch -march=z10" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/sh/prefetchi-1.c
b/gcc/testsuite/gcc.target/sh/prefetchi-1.c
new file mode 100644
index 00000000000..347bdea8df8
--- /dev/null
+++ b/gcc/testsuite/gcc.target/sh/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile { target { has_pref } } } */
+/* { dg-options "-O2" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
diff --git a/gcc/testsuite/gcc.target/sparc/prefetchi-1.c
b/gcc/testsuite/gcc.target/sparc/prefetchi-1.c
new file mode 100644
index 00000000000..1bd7ad495e2
--- /dev/null
+++ b/gcc/testsuite/gcc.target/sparc/prefetchi-1.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -mcpu=v9" } */
+
+/* Remind users that instruction prefetch is not supported yet. */
+
+void
+bad (const int* p)
+{
+ __builtin_prefetch(p, 0, 3, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+ __builtin_prefetch(p, 0, 2, 0); /* { dg-warning "instruction prefetch is not
supported; using data prefetch" } */
+}
