This is an archive of the discontinued LLVM Phabricator instance.

Differential D95663

Update ElementsAttr::isValidIndex to handle ElementsAttr with a scalar. Scalar will have rank 0.
ClosedPublic

Authored by karimnosseir on Jan 28 2021, 9:13 PM.

Download Raw Diff

Details

Reviewers

Commits

rG0af25275364e: Update ElementsAttr::isValidIndex to handle ElementsAttr with a scalar. Scalar…

Summary

Update ElementsAttr::isValidIndex to handle ElementsAttr with a scalar. Scalar will have rank 0.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

karimnosseir created this revision.Jan 28 2021, 9:13 PM

Herald added subscribers: teijeong, rdzhabarov, tatianashp and 15 others. · View Herald TranscriptJan 28 2021, 9:13 PM

karimnosseir requested review of this revision.Jan 28 2021, 9:13 PM

Herald added a project: Restricted Project. · View Herald TranscriptJan 28 2021, 9:13 PM

Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript

Harbormaster completed remote builds in B87120: Diff 320041.Jan 28 2021, 9:44 PM

Can you add a test for this?

Added unit-test

Thanks River. PTAL

Harbormaster completed remote builds in B87179: Diff 320147.Jan 29 2021, 9:56 AM

LGTM thanks.

mlir/unittests/IR/AttributeTest.cpp
195 ↗	(On Diff #320147)

This revision is now accepted and ready to land.Jan 29 2021, 4:15 PM

Updated test name

karimnosseir marked an inline comment as done.Jan 29 2021, 4:32 PM

This revision was landed with ongoing or failed builds.Jan 29 2021, 4:56 PM

Closed by commit rG0af25275364e: Update ElementsAttr::isValidIndex to handle ElementsAttr with a scalar. Scalar… (authored by karimnosseir, committed by jpienaar). · Explain Why

This revision was automatically updated to reflect the committed changes.

jpienaar added a commit: rG0af25275364e: Update ElementsAttr::isValidIndex to handle ElementsAttr with a scalar. Scalar….

Harbormaster completed remote builds in B87222: Diff 320235.Jan 29 2021, 5:01 PM

Revision Contents

Path

Size

mlir/

lib/

IR/

BuiltinAttributes.cpp

2 lines

Diff 320041

mlir/lib/IR/BuiltinAttributes.cpp

	Show First 20 Lines • Show All 453 Lines • ▼ Show 20 Lines
	}			}

	/// Return if the given 'index' refers to a valid element in this attribute.			/// Return if the given 'index' refers to a valid element in this attribute.
	bool ElementsAttr::isValidIndex(ArrayRef<uint64_t> index) const {			bool ElementsAttr::isValidIndex(ArrayRef<uint64_t> index) const {
	auto type = getType();			auto type = getType();

	// Verify that the rank of the indices matches the held type.			// Verify that the rank of the indices matches the held type.
	auto rank = type.getRank();			auto rank = type.getRank();
				if (rank == 0 && index.size() == 1 && index[0] == 0)
				return true;
	if (rank != static_cast<int64_t>(index.size()))			if (rank != static_cast<int64_t>(index.size()))
	return false;			return false;

	// Verify that all of the indices are within the shape dimensions.			// Verify that all of the indices are within the shape dimensions.
	auto shape = type.getShape();			auto shape = type.getShape();
	return llvm::all_of(llvm::seq<int>(0, rank), [&](int i) {			return llvm::all_of(llvm::seq<int>(0, rank), [&](int i) {
	return static_cast<int64_t>(index[i]) < shape[i];			return static_cast<int64_t>(index[i]) < shape[i];
	});			});
	▲ Show 20 Lines • Show All 994 Lines • Show Last 20 Lines