From 8289930decdc1b47c1d4562433313d84d88b3f42 Mon Sep 17 00:00:00 2001 From: Emanuel Peter Date: Fri, 26 Jan 2024 16:40:14 +0100 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Christian Hagedorn --- src/hotspot/share/compiler/compilerDirectives.cpp | 2 +- src/hotspot/share/opto/superword.cpp | 8 ++++---- src/hotspot/share/opto/traceAutoVectorizationTag.hpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hotspot/share/compiler/compilerDirectives.cpp b/src/hotspot/share/compiler/compilerDirectives.cpp index 11ef19a890863..05720dbc2411c 100644 --- a/src/hotspot/share/compiler/compilerDirectives.cpp +++ b/src/hotspot/share/compiler/compilerDirectives.cpp @@ -302,7 +302,7 @@ DirectiveSet::DirectiveSet(CompilerDirectives* d) : _inlinematchers(nullptr), _directive(d), _ideal_phase_name_set(PHASE_NUM_TYPES, mtCompiler), - _traceautovectorization_tags(TRACEAUTOVECTORIZATION_TAG_NUM, mtCompiler) + _trace_auto_vectorization_tags(TRACE_AUTO_VECTORIZATION_TAG_NUM, mtCompiler) { #define init_defaults_definition(name, type, dvalue, compiler) this->name##Option = dvalue; compilerdirectives_common_flags(init_defaults_definition) diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp index a08a7a5624fe6..21ee970ae042b 100644 --- a/src/hotspot/share/opto/superword.cpp +++ b/src/hotspot/share/opto/superword.cpp @@ -1228,7 +1228,7 @@ bool SuperWord::follow_use_defs(Node_List* p) { if (s1->is_Load()) return false; #ifndef PRODUCT - if(is_trace_superword_alignment()) { + if (is_trace_superword_alignment()) { tty->print_cr("SuperWord::follow_use_defs: s1 %d, align %d", s1->_idx, alignment(s1)); } @@ -1252,7 +1252,7 @@ bool SuperWord::follow_use_defs(Node_List* p) { pair->push(t2); _packset.append(pair); #ifndef PRODUCT - if(is_trace_superword_alignment()) { + if (is_trace_superword_alignment()) { tty->print_cr("SuperWord::follow_use_defs: set_alignment(%d, %d, %d)", t1->_idx, t2->_idx, align); } @@ -1279,7 +1279,7 @@ bool SuperWord::follow_def_uses(Node_List* p) { int align = alignment(s1); #ifndef PRODUCT - if(is_trace_superword_alignment()) { + if (is_trace_superword_alignment()) { tty->print_cr("SuperWord::follow_def_uses: s1 %d, align %d", s1->_idx, align); } @@ -1326,7 +1326,7 @@ bool SuperWord::follow_def_uses(Node_List* p) { pair->push(u2); _packset.append(pair); #ifndef PRODUCT - if(is_trace_superword_alignment()) { + if (is_trace_superword_alignment()) { tty->print_cr("SuperWord::follow_def_uses: set_alignment(%d, %d, %d)", u1->_idx, u2->_idx, align); } diff --git a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp index ee06857aae3e1..310ed69575bd8 100644 --- a/src/hotspot/share/opto/traceAutoVectorizationTag.hpp +++ b/src/hotspot/share/opto/traceAutoVectorizationTag.hpp @@ -28,7 +28,7 @@ #include "utilities/bitMap.inline.hpp" // TODO: adjust tags to what we need -#define COMPILER_TRACEAUTOVECTORIZATION_TAG(flags) \ +#define COMPILER_TRACE_AUTO_VECTORIZATION_TAG(flags) \ flags(POINTER_ANALYSIS, "Trace VPointer") \ flags(SW_PRECONDITION, "Trace SuperWord precondition") \ flags(SW_TYPES, "Trace SuperWord::compute_vector_element_type") \ @@ -141,7 +141,7 @@ class TraceAutoVectorizationTagValidator { tag_name++; set_bit = false; } - TraceAutoVectorizationTag tat = find_tag(tag_name); + TraceAutoVectorizationTag tag = find_tag(tag_name); if (TRACEAUTOVECTORIZATION_TAG_NONE == tat) { // cap len to a value we know is enough for all tags const size_t len = MIN2(strlen(*iter), 63) + 1;