Skip to content

Commit f0bae79

Browse files
committed
8324750: C2: rename Matcher methods using "superword" -> "autovectorization"
Reviewed-by: kvn, chagedorn
1 parent 6ad78ca commit f0bae79

File tree

12 files changed

+34
-34
lines changed

12 files changed

+34
-34
lines changed

src/hotspot/cpu/aarch64/aarch64.ad

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2377,7 +2377,7 @@ int Matcher::min_vector_size(const BasicType bt) {
23772377
return MIN2(size, max_size);
23782378
}
23792379

2380-
int Matcher::superword_max_vector_size(const BasicType bt) {
2380+
int Matcher::max_vector_size_auto_vectorization(const BasicType bt) {
23812381
return Matcher::max_vector_size(bt);
23822382
}
23832383

src/hotspot/cpu/aarch64/aarch64_vector.ad

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
// Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
44
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
//
@@ -126,7 +126,7 @@ source %{
126126
}
127127
}
128128

129-
bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
129+
bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
130130
if (UseSVE == 0) {
131131
// These operations are not profitable to be vectorized on NEON, because no direct
132132
// NEON instructions support them. But the match rule support for them is profitable for

src/hotspot/cpu/aarch64/aarch64_vector_ad.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
// Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
44
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
//
@@ -116,7 +116,7 @@ source %{
116116
}
117117
}
118118

119-
bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
119+
bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
120120
if (UseSVE == 0) {
121121
// These operations are not profitable to be vectorized on NEON, because no direct
122122
// NEON instructions support them. But the match rule support for them is profitable for

src/hotspot/cpu/arm/arm.ad

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ bool Matcher::match_rule_supported(int opcode) {
10021002
return true; // Per default match rules are supported.
10031003
}
10041004

1005-
bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
1005+
bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
10061006
return match_rule_supported_vector(opcode, vlen, bt);
10071007
}
10081008

@@ -1074,7 +1074,7 @@ int Matcher::min_vector_size(const BasicType bt) {
10741074
return 8/type2aelembytes(bt);
10751075
}
10761076

1077-
int Matcher::superword_max_vector_size(const BasicType bt) {
1077+
int Matcher::max_vector_size_auto_vectorization(const BasicType bt) {
10781078
return Matcher::max_vector_size(bt);
10791079
}
10801080

src/hotspot/cpu/ppc/ppc.ad

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
33
// Copyright (c) 2012, 2023 SAP SE. All rights reserved.
44
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
//
@@ -2173,7 +2173,7 @@ bool Matcher::match_rule_supported(int opcode) {
21732173
return true; // Per default match rules are supported.
21742174
}
21752175

2176-
bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
2176+
bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
21772177
return match_rule_supported_vector(opcode, vlen, bt);
21782178
}
21792179

@@ -2242,7 +2242,7 @@ int Matcher::min_vector_size(const BasicType bt) {
22422242
return max_vector_size(bt); // Same as max.
22432243
}
22442244

2245-
int Matcher::superword_max_vector_size(const BasicType bt) {
2245+
int Matcher::max_vector_size_auto_vectorization(const BasicType bt) {
22462246
return Matcher::max_vector_size(bt);
22472247
}
22482248

src/hotspot/cpu/riscv/riscv.ad

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
33
// Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
44
// Copyright (c) 2020, 2023, Huawei Technologies Co., Ltd. All rights reserved.
55
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2017,7 +2017,7 @@ int Matcher::min_vector_size(const BasicType bt) {
20172017
return MIN2(size, max_size);
20182018
}
20192019

2020-
int Matcher::superword_max_vector_size(const BasicType bt) {
2020+
int Matcher::max_vector_size_auto_vectorization(const BasicType bt) {
20212021
return Matcher::max_vector_size(bt);
20222022
}
20232023

src/hotspot/cpu/riscv/riscv_v.ad

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
// Copyright (c) 2020, 2023, Arm Limited. All rights reserved.
44
// Copyright (c) 2020, 2022, Huawei Technologies Co., Ltd. All rights reserved.
55
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,7 +46,7 @@ source %{
4646
}
4747
}
4848

49-
bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
49+
bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
5050
return match_rule_supported_vector(opcode, vlen, bt);
5151
}
5252

src/hotspot/cpu/s390/s390.ad

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
// Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
// Copyright (c) 2017, 2022 SAP SE. All rights reserved.
44
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
//
@@ -1513,7 +1513,7 @@ bool Matcher::match_rule_supported(int opcode) {
15131513
return true; // Per default match rules are supported.
15141514
}
15151515

1516-
bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
1516+
bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
15171517
return match_rule_supported_vector(opcode, vlen, bt);
15181518
}
15191519

@@ -1574,7 +1574,7 @@ int Matcher::min_vector_size(const BasicType bt) {
15741574
return max_vector_size(bt); // Same as max.
15751575
}
15761576

1577-
int Matcher::superword_max_vector_size(const BasicType bt) {
1577+
int Matcher::max_vector_size_auto_vectorization(const BasicType bt) {
15781578
return Matcher::max_vector_size(bt);
15791579
}
15801580

src/hotspot/cpu/x86/x86.ad

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,7 @@ static inline bool is_pop_count_instr_target(BasicType bt) {
16991699
(is_non_subword_integral_type(bt) && VM_Version::supports_avx512_vpopcntdq());
17001700
}
17011701

1702-
bool Matcher::match_rule_supported_superword(int opcode, int vlen, BasicType bt) {
1702+
bool Matcher::match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt) {
17031703
return match_rule_supported_vector(opcode, vlen, bt);
17041704
}
17051705

@@ -2280,7 +2280,7 @@ int Matcher::min_vector_size(const BasicType bt) {
22802280
return MIN2(size,max_size);
22812281
}
22822282

2283-
int Matcher::superword_max_vector_size(const BasicType bt) {
2283+
int Matcher::max_vector_size_auto_vectorization(const BasicType bt) {
22842284
// Limit the max vector size for auto vectorization to 256 bits (32 bytes)
22852285
// by default on Cascade Lake
22862286
if (VM_Version::is_default_intel_cascade_lake()) {

src/hotspot/share/opto/matcher.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class Matcher : public PhaseTransform {
331331

332332
// Identify extra cases that we might want to vectorize automatically
333333
// And exclude cases which are not profitable to auto-vectorize.
334-
static bool match_rule_supported_superword(int opcode, int vlen, BasicType bt);
334+
static bool match_rule_supported_auto_vectorization(int opcode, int vlen, BasicType bt);
335335

336336
// identify extra cases that we might want to provide match rules for
337337
// e.g. Op_ vector nodes and other intrinsics while guarding with vlen
@@ -355,7 +355,7 @@ class Matcher : public PhaseTransform {
355355
Matcher::min_vector_size(bt) <= size);
356356
}
357357
// Limits on max vector size (number of elements) for auto-vectorization.
358-
static int superword_max_vector_size(const BasicType bt);
358+
static int max_vector_size_auto_vectorization(const BasicType bt);
359359

360360
// Actual max scalable vector register length.
361361
static int scalable_vector_reg_size(const BasicType bt);

0 commit comments

Comments
 (0)