Skip to content

Revert "[CodeGen] Use OwningArrayRef in NodeMetadata (NFC)" #137684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
Merged

Revert "[CodeGen] Use OwningArrayRef in NodeMetadata (NFC)" #137684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions llvm/include/llvm/CodeGen/RegAllocPBQP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#ifndef LLVM_CODEGEN_REGALLOCPBQP_H
#define LLVM_CODEGEN_REGALLOCPBQP_H

#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/Hashing.h"
#include "llvm/CodeGen/PBQP/CostAllocator.h"
Expand Down Expand Up @@ -184,14 +183,18 @@ class NodeMetadata {
NodeMetadata() = default;

NodeMetadata(const NodeMetadata &Other)
: RS(Other.RS), DeniedOpts(Other.DeniedOpts),
OptUnsafeEdges(ArrayRef<unsigned>(Other.OptUnsafeEdges)),
VReg(Other.VReg), AllowedRegs(Other.AllowedRegs)
: RS(Other.RS), NumOpts(Other.NumOpts), DeniedOpts(Other.DeniedOpts),
OptUnsafeEdges(new unsigned[NumOpts]), VReg(Other.VReg),
AllowedRegs(Other.AllowedRegs)
#if LLVM_ENABLE_ABI_BREAKING_CHECKS
,
everConservativelyAllocatable(Other.everConservativelyAllocatable)
#endif
{
if (NumOpts > 0) {
std::copy(&Other.OptUnsafeEdges[0], &Other.OptUnsafeEdges[NumOpts],
&OptUnsafeEdges[0]);
}
}

NodeMetadata(NodeMetadata &&) = default;
Expand All @@ -206,7 +209,8 @@ class NodeMetadata {
const AllowedRegVector& getAllowedRegs() const { return *AllowedRegs; }

void setup(const Vector& Costs) {
OptUnsafeEdges = OwningArrayRef<unsigned>(Costs.getLength() - 1);
NumOpts = Costs.getLength() - 1;
OptUnsafeEdges = std::unique_ptr<unsigned[]>(new unsigned[NumOpts]());
}

ReductionState getReductionState() const { return RS; }
Expand All @@ -226,21 +230,22 @@ class NodeMetadata {
DeniedOpts += Transpose ? MD.getWorstRow() : MD.getWorstCol();
const bool* UnsafeOpts =
Transpose ? MD.getUnsafeCols() : MD.getUnsafeRows();
for (unsigned i = 0; i < OptUnsafeEdges.size(); ++i)
for (unsigned i = 0; i < NumOpts; ++i)
OptUnsafeEdges[i] += UnsafeOpts[i];
}

void handleRemoveEdge(const MatrixMetadata& MD, bool Transpose) {
DeniedOpts -= Transpose ? MD.getWorstRow() : MD.getWorstCol();
const bool* UnsafeOpts =
Transpose ? MD.getUnsafeCols() : MD.getUnsafeRows();
for (unsigned i = 0; i < OptUnsafeEdges.size(); ++i)
for (unsigned i = 0; i < NumOpts; ++i)
OptUnsafeEdges[i] -= UnsafeOpts[i];
}

bool isConservativelyAllocatable() const {
return (DeniedOpts < OptUnsafeEdges.size()) ||
llvm::is_contained(OptUnsafeEdges, 0);
return (DeniedOpts < NumOpts) ||
(std::find(&OptUnsafeEdges[0], &OptUnsafeEdges[NumOpts], 0) !=
&OptUnsafeEdges[NumOpts]);
}

#if LLVM_ENABLE_ABI_BREAKING_CHECKS
Expand All @@ -251,8 +256,9 @@ class NodeMetadata {

private:
ReductionState RS = Unprocessed;
unsigned NumOpts = 0;
unsigned DeniedOpts = 0;
OwningArrayRef<unsigned> OptUnsafeEdges;
std::unique_ptr<unsigned[]> OptUnsafeEdges;
Register VReg;
GraphMetadata::AllowedRegVecRef AllowedRegs;

Expand Down
Loading