Skip to content

Commit aa21de5

Browse files
author
Quan Anh Mai
committedJan 17, 2025
8347481: C2: Remove the control input of some nodes
Reviewed-by: dfenacci, vlivanov, kvn
1 parent 1f365cc commit aa21de5

File tree

8 files changed

+55
-57
lines changed

8 files changed

+55
-57
lines changed
 

‎src/hotspot/share/opto/addnode.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1120,7 +1120,7 @@ Node* MaxNode::build_min_max(Node* a, Node* b, bool is_max, bool is_unsigned, co
11201120
cmp = gvn.transform(CmpNode::make(b, a, bt, is_unsigned));
11211121
}
11221122
Node* bol = gvn.transform(new BoolNode(cmp, BoolTest::lt));
1123-
res = gvn.transform(CMoveNode::make(nullptr, bol, a, b, t));
1123+
res = gvn.transform(CMoveNode::make(bol, a, b, t));
11241124
}
11251125
if (hook != nullptr) {
11261126
hook->destruct(&gvn);
@@ -1149,7 +1149,7 @@ Node* MaxNode::build_min_max_diff_with_zero(Node* a, Node* b, bool is_max, const
11491149
}
11501150
Node* sub = gvn.transform(SubNode::make(a, b, bt));
11511151
Node* bol = gvn.transform(new BoolNode(cmp, BoolTest::lt));
1152-
Node* res = gvn.transform(CMoveNode::make(nullptr, bol, sub, zero, t));
1152+
Node* res = gvn.transform(CMoveNode::make(bol, sub, zero, t));
11531153
if (hook != nullptr) {
11541154
hook->destruct(&gvn);
11551155
}

‎src/hotspot/share/opto/library_call.cpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -2140,18 +2140,18 @@ bool LibraryCallKit::inline_number_methods(vmIntrinsics::ID id) {
21402140
Node* arg = argument(0);
21412141
Node* n = nullptr;
21422142
switch (id) {
2143-
case vmIntrinsics::_numberOfLeadingZeros_i: n = new CountLeadingZerosINode( arg); break;
2144-
case vmIntrinsics::_numberOfLeadingZeros_l: n = new CountLeadingZerosLNode( arg); break;
2145-
case vmIntrinsics::_numberOfTrailingZeros_i: n = new CountTrailingZerosINode(arg); break;
2146-
case vmIntrinsics::_numberOfTrailingZeros_l: n = new CountTrailingZerosLNode(arg); break;
2147-
case vmIntrinsics::_bitCount_i: n = new PopCountINode( arg); break;
2148-
case vmIntrinsics::_bitCount_l: n = new PopCountLNode( arg); break;
2149-
case vmIntrinsics::_reverseBytes_c: n = new ReverseBytesUSNode(nullptr, arg); break;
2150-
case vmIntrinsics::_reverseBytes_s: n = new ReverseBytesSNode( nullptr, arg); break;
2151-
case vmIntrinsics::_reverseBytes_i: n = new ReverseBytesINode( nullptr, arg); break;
2152-
case vmIntrinsics::_reverseBytes_l: n = new ReverseBytesLNode( nullptr, arg); break;
2153-
case vmIntrinsics::_reverse_i: n = new ReverseINode(nullptr, arg); break;
2154-
case vmIntrinsics::_reverse_l: n = new ReverseLNode(nullptr, arg); break;
2143+
case vmIntrinsics::_numberOfLeadingZeros_i: n = new CountLeadingZerosINode( arg); break;
2144+
case vmIntrinsics::_numberOfLeadingZeros_l: n = new CountLeadingZerosLNode( arg); break;
2145+
case vmIntrinsics::_numberOfTrailingZeros_i: n = new CountTrailingZerosINode(arg); break;
2146+
case vmIntrinsics::_numberOfTrailingZeros_l: n = new CountTrailingZerosLNode(arg); break;
2147+
case vmIntrinsics::_bitCount_i: n = new PopCountINode( arg); break;
2148+
case vmIntrinsics::_bitCount_l: n = new PopCountLNode( arg); break;
2149+
case vmIntrinsics::_reverseBytes_c: n = new ReverseBytesUSNode( arg); break;
2150+
case vmIntrinsics::_reverseBytes_s: n = new ReverseBytesSNode( arg); break;
2151+
case vmIntrinsics::_reverseBytes_i: n = new ReverseBytesINode( arg); break;
2152+
case vmIntrinsics::_reverseBytes_l: n = new ReverseBytesLNode( arg); break;
2153+
case vmIntrinsics::_reverse_i: n = new ReverseINode( arg); break;
2154+
case vmIntrinsics::_reverse_l: n = new ReverseLNode( arg); break;
21552155
default: fatal_unexpected_iid(id); break;
21562156
}
21572157
set_result(_gvn.transform(n));
@@ -8271,14 +8271,14 @@ bool LibraryCallKit::inline_fma(vmIntrinsics::ID id) {
82718271
a = round_double_node(argument(0));
82728272
b = round_double_node(argument(2));
82738273
c = round_double_node(argument(4));
8274-
result = _gvn.transform(new FmaDNode(control(), a, b, c));
8274+
result = _gvn.transform(new FmaDNode(a, b, c));
82758275
break;
82768276
case vmIntrinsics::_fmaF:
82778277
assert(callee()->signature()->size() == 3, "fma has 3 parameters of size 1 each.");
82788278
a = argument(0);
82798279
b = argument(1);
82808280
c = argument(2);
8281-
result = _gvn.transform(new FmaFNode(control(), a, b, c));
8281+
result = _gvn.transform(new FmaFNode(a, b, c));
82828282
break;
82838283
default:
82848284
fatal_unexpected_iid(id); break;

‎src/hotspot/share/opto/loopopts.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -857,9 +857,9 @@ Node *PhaseIdealLoop::conditional_move( Node *region ) {
857857
}
858858
}
859859
}
860-
Node *cmov = CMoveNode::make(cmov_ctrl, iff->in(1), phi->in(1+flip), phi->in(2-flip), _igvn.type(phi));
861-
register_new_node( cmov, cmov_ctrl );
862-
_igvn.replace_node( phi, cmov );
860+
Node* cmov = CMoveNode::make(iff->in(1), phi->in(1+flip), phi->in(2-flip), _igvn.type(phi));
861+
register_new_node(cmov, cmov_ctrl);
862+
_igvn.replace_node(phi, cmov);
863863
#ifndef PRODUCT
864864
if (TraceLoopOpts) {
865865
tty->print("CMOV ");

‎src/hotspot/share/opto/movenode.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@ Node *CMoveNode::Ideal(PhaseGVN *phase, bool can_reshape) {
102102
// Canonicalize the node by moving constants to the right input.
103103
if (in(Condition)->is_Bool() && phase->type(in(IfFalse))->singleton() && !phase->type(in(IfTrue))->singleton()) {
104104
BoolNode* b = in(Condition)->as_Bool()->negate(phase);
105-
return make(in(Control), phase->transform(b), in(IfTrue), in(IfFalse), _type);
105+
return make(phase->transform(b), in(IfTrue), in(IfFalse), _type);
106106
}
107107

108108
return nullptr;
@@ -186,15 +186,15 @@ const Type* CMoveNode::Value(PhaseGVN* phase) const {
186186
//------------------------------make-------------------------------------------
187187
// Make a correctly-flavored CMove. Since _type is directly determined
188188
// from the inputs we do not need to specify it here.
189-
CMoveNode *CMoveNode::make(Node *c, Node *bol, Node *left, Node *right, const Type *t) {
189+
CMoveNode* CMoveNode::make(Node* bol, Node* left, Node* right, const Type* t) {
190190
switch( t->basic_type() ) {
191-
case T_INT: return new CMoveINode( bol, left, right, t->is_int() );
192-
case T_FLOAT: return new CMoveFNode( bol, left, right, t );
193-
case T_DOUBLE: return new CMoveDNode( bol, left, right, t );
194-
case T_LONG: return new CMoveLNode( bol, left, right, t->is_long() );
195-
case T_OBJECT: return new CMovePNode( c, bol, left, right, t->is_oopptr() );
196-
case T_ADDRESS: return new CMovePNode( c, bol, left, right, t->is_ptr() );
197-
case T_NARROWOOP: return new CMoveNNode( c, bol, left, right, t );
191+
case T_INT: return new CMoveINode(bol, left, right, t->is_int());
192+
case T_FLOAT: return new CMoveFNode(bol, left, right, t);
193+
case T_DOUBLE: return new CMoveDNode(bol, left, right, t);
194+
case T_LONG: return new CMoveLNode(bol, left, right, t->is_long());
195+
case T_OBJECT: return new CMovePNode(bol, left, right, t->is_oopptr());
196+
case T_ADDRESS: return new CMovePNode(bol, left, right, t->is_ptr());
197+
case T_NARROWOOP: return new CMoveNNode(bol, left, right, t);
198198
default:
199199
ShouldNotReachHere();
200200
return nullptr;
@@ -278,7 +278,7 @@ Node *CMoveINode::Ideal(PhaseGVN *phase, bool can_reshape) {
278278
if( in(Condition)->is_Bool() ) {
279279
BoolNode* b = in(Condition)->as_Bool();
280280
BoolNode* b2 = b->negate(phase);
281-
return make(in(Control), phase->transform(b2), in(IfTrue), in(IfFalse), _type);
281+
return make(phase->transform(b2), in(IfTrue), in(IfFalse), _type);
282282
}
283283
}
284284

‎src/hotspot/share/opto/movenode.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@ class CMoveNode : public TypeNode {
4747
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
4848
virtual const Type* Value(PhaseGVN* phase) const;
4949
virtual Node* Identity(PhaseGVN* phase);
50-
static CMoveNode *make(Node *c, Node *bol, Node *left, Node *right, const Type *t);
50+
static CMoveNode* make(Node* bol, Node* left, Node* right, const Type* t);
5151
// Helper function to spot cmove graph shapes
5252
static Node* is_cmove_id(PhaseTransform* phase, Node* cmp, Node* t, Node* f, BoolNode* b);
5353
static Node* Ideal_minmax(PhaseGVN* phase, CMoveNode* cmov);
@@ -87,14 +87,14 @@ class CMoveLNode : public CMoveNode {
8787
//------------------------------CMovePNode-------------------------------------
8888
class CMovePNode : public CMoveNode {
8989
public:
90-
CMovePNode( Node *c, Node *bol, Node *left, Node *right, const TypePtr* t ) : CMoveNode(bol,left,right,t) { init_req(Control,c); }
90+
CMovePNode(Node* bol, Node* left, Node* right, const TypePtr* t) : CMoveNode(bol, left, right, t) {}
9191
virtual int Opcode() const;
9292
};
9393

9494
//------------------------------CMoveNNode-------------------------------------
9595
class CMoveNNode : public CMoveNode {
9696
public:
97-
CMoveNNode( Node *c, Node *bol, Node *left, Node *right, const Type* t ) : CMoveNode(bol,left,right,t) { init_req(Control,c); }
97+
CMoveNNode(Node* bol, Node* left, Node* right, const Type* t ) : CMoveNode(bol, left, right, t) {}
9898
virtual int Opcode() const;
9999
};
100100

‎src/hotspot/share/opto/mulnode.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -388,7 +388,7 @@ inline Node* make_urshift<TypeInt>(Node* a, Node* b) {
388388
// fused-multiply-add
389389
class FmaNode : public Node {
390390
public:
391-
FmaNode(Node* c, Node* in1, Node* in2, Node* in3) : Node(c, in1, in2, in3) {
391+
FmaNode(Node* in1, Node* in2, Node* in3) : Node(nullptr, in1, in2, in3) {
392392
assert(UseFMA, "Needs FMA instructions support.");
393393
}
394394
virtual Node* Ideal(PhaseGVN* phase, bool can_reshape);
@@ -398,7 +398,7 @@ class FmaNode : public Node {
398398
// fused-multiply-add double
399399
class FmaDNode : public FmaNode {
400400
public:
401-
FmaDNode(Node* c, Node* in1, Node* in2, Node* in3) : FmaNode(c, in1, in2, in3) {}
401+
FmaDNode(Node* in1, Node* in2, Node* in3) : FmaNode(in1, in2, in3) {}
402402
virtual int Opcode() const;
403403
const Type* bottom_type() const { return Type::DOUBLE; }
404404
virtual uint ideal_reg() const { return Op_RegD; }
@@ -409,7 +409,7 @@ class FmaDNode : public FmaNode {
409409
// fused-multiply-add float
410410
class FmaFNode : public FmaNode {
411411
public:
412-
FmaFNode(Node* c, Node* in1, Node* in2, Node* in3) : FmaNode(c, in1, in2, in3) {}
412+
FmaFNode(Node* in1, Node* in2, Node* in3) : FmaNode(in1, in2, in3) {}
413413
virtual int Opcode() const;
414414
const Type* bottom_type() const { return Type::FLOAT; }
415415
virtual uint ideal_reg() const { return Op_RegF; }

‎src/hotspot/share/opto/subnode.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -1416,9 +1416,7 @@ Node* BoolNode::make_predicate(Node* test_value, PhaseGVN* phase) {
14161416
//--------------------------------as_int_value---------------------------------
14171417
Node* BoolNode::as_int_value(PhaseGVN* phase) {
14181418
// Inverse to make_predicate. The CMove probably boils down to a Conv2B.
1419-
Node* cmov = CMoveNode::make(nullptr, this,
1420-
phase->intcon(0), phase->intcon(1),
1421-
TypeInt::BOOL);
1419+
Node* cmov = CMoveNode::make(this, phase->intcon(0), phase->intcon(1), TypeInt::BOOL);
14221420
return phase->transform(cmov);
14231421
}
14241422

‎src/hotspot/share/opto/subnode.hpp

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -532,49 +532,49 @@ class SqrtFNode : public Node {
532532
// reverse bytes of an integer
533533
class ReverseBytesINode : public Node {
534534
public:
535-
ReverseBytesINode(Node *c, Node *in1) : Node(c, in1) {}
535+
ReverseBytesINode(Node* in) : Node(nullptr, in) {}
536536
virtual int Opcode() const;
537-
const Type *bottom_type() const { return TypeInt::INT; }
537+
const Type* bottom_type() const { return TypeInt::INT; }
538538
virtual uint ideal_reg() const { return Op_RegI; }
539539
};
540540

541541
//-------------------------------ReverseBytesLNode--------------------------------
542542
// reverse bytes of a long
543543
class ReverseBytesLNode : public Node {
544544
public:
545-
ReverseBytesLNode(Node *c, Node *in1) : Node(c, in1) {}
545+
ReverseBytesLNode(Node* in) : Node(nullptr, in) {}
546546
virtual int Opcode() const;
547-
const Type *bottom_type() const { return TypeLong::LONG; }
547+
const Type* bottom_type() const { return TypeLong::LONG; }
548548
virtual uint ideal_reg() const { return Op_RegL; }
549549
};
550550

551551
//-------------------------------ReverseBytesUSNode--------------------------------
552552
// reverse bytes of an unsigned short / char
553553
class ReverseBytesUSNode : public Node {
554554
public:
555-
ReverseBytesUSNode(Node *c, Node *in1) : Node(c, in1) {}
555+
ReverseBytesUSNode(Node* in1) : Node(nullptr, in1) {}
556556
virtual int Opcode() const;
557-
const Type *bottom_type() const { return TypeInt::CHAR; }
557+
const Type* bottom_type() const { return TypeInt::CHAR; }
558558
virtual uint ideal_reg() const { return Op_RegI; }
559559
};
560560

561561
//-------------------------------ReverseBytesSNode--------------------------------
562562
// reverse bytes of a short
563563
class ReverseBytesSNode : public Node {
564564
public:
565-
ReverseBytesSNode(Node *c, Node *in1) : Node(c, in1) {}
565+
ReverseBytesSNode(Node* in) : Node(nullptr, in) {}
566566
virtual int Opcode() const;
567-
const Type *bottom_type() const { return TypeInt::SHORT; }
567+
const Type* bottom_type() const { return TypeInt::SHORT; }
568568
virtual uint ideal_reg() const { return Op_RegI; }
569569
};
570570

571571
//-------------------------------ReverseINode--------------------------------
572572
// reverse bits of an int
573573
class ReverseINode : public Node {
574574
public:
575-
ReverseINode(Node *c, Node *in1) : Node(c, in1) {}
575+
ReverseINode(Node* in) : Node(nullptr, in) {}
576576
virtual int Opcode() const;
577-
const Type *bottom_type() const { return TypeInt::INT; }
577+
const Type* bottom_type() const { return TypeInt::INT; }
578578
virtual uint ideal_reg() const { return Op_RegI; }
579579
virtual Node* Identity(PhaseGVN* phase);
580580
virtual const Type* Value(PhaseGVN* phase) const;
@@ -584,9 +584,9 @@ class ReverseINode : public Node {
584584
// reverse bits of a long
585585
class ReverseLNode : public Node {
586586
public:
587-
ReverseLNode(Node *c, Node *in1) : Node(c, in1) {}
587+
ReverseLNode(Node* in) : Node(nullptr, in) {}
588588
virtual int Opcode() const;
589-
const Type *bottom_type() const { return TypeLong::LONG; }
589+
const Type* bottom_type() const { return TypeLong::LONG; }
590590
virtual uint ideal_reg() const { return Op_RegL; }
591591
virtual Node* Identity(PhaseGVN* phase);
592592
virtual const Type* Value(PhaseGVN* phase) const;

0 commit comments

Comments
 (0)
Please sign in to comment.