This is an archive of the discontinued LLVM Phabricator instance.

Differential D120832

[MLIR] Use Datalayout defaults when importing LLVM
ClosedPublic

Authored by wsmoses on Mar 2 2022, 9:41 AM.

Download Raw Diff

Details

Reviewers

ftynse
rriddle
mehdi_amini

Commits

rG758ddba38113: [MLIR] Use Datalayout defaults when importing LLVM

Summary

LLVM defines several default datalayouts for integer and floating point types that are not being considered when importing into MLIR. This patch remedies this.

Diff Detail

Repository: rG LLVM Github Monorepo

Event Timeline

wsmoses created this revision.Mar 2 2022, 9:41 AM

Herald added a project: Restricted Project. · View Herald TranscriptMar 2 2022, 9:41 AM

Herald added subscribers: awarzynski, sdasgup3, wenzhicui and 18 others. · View Herald Transcript

wsmoses requested review of this revision.Mar 2 2022, 9:41 AM

Herald added a project: Restricted Project. · View Herald TranscriptMar 2 2022, 9:41 AM

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

ftynse accepted this revision.Mar 2 2022, 9:52 AM

ftynse added inline comments.

mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp
99–101

This revision is now accepted and ready to land.Mar 2 2022, 9:52 AM

Harbormaster completed remote builds in B152198: Diff 412465.Mar 2 2022, 10:00 AM

Closed by commit rG758ddba38113: [MLIR] Use Datalayout defaults when importing LLVM (authored by wsmoses). · Explain WhyMar 2 2022, 10:01 AM

This revision was automatically updated to reflect the committed changes.

wsmoses added a commit: rG758ddba38113: [MLIR] Use Datalayout defaults when importing LLVM.

Revision Contents

Path

Size

mlir/

lib/

Target/

LLVMIR/

ConvertFromLLVMIR.cpp

21 lines

test/

Target/

LLVMIR/

data-layout.ll

1 line

Diff 412465

mlir/lib/Target/LLVMIR/ConvertFromLLVMIR.cpp

Show All 16 Lines

#include "mlir/IR/Builders.h"

#include "mlir/IR/BuiltinOps.h"

#include "mlir/IR/BuiltinTypes.h"

#include "mlir/IR/MLIRContext.h"

#include "mlir/Interfaces/DataLayoutInterfaces.h"

#include "mlir/Target/LLVMIR/TypeFromLLVM.h"

#include "mlir/Translation.h"

#include "llvm/ADT/StringSet.h"

#include "llvm/ADT/TypeSwitch.h"

#include "llvm/IR/Attributes.h"

#include "llvm/IR/Constants.h"

#include "llvm/IR/DerivedTypes.h"

#include "llvm/IR/Function.h"

#include "llvm/IR/InlineAsm.h"

#include "llvm/IR/Instructions.h"

#include "llvm/IR/Type.h"

▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Lines

default:

return nullptr;

}

DataLayoutSpecInterface

mlir::translateDataLayout(const llvm::DataLayout &dataLayout,

MLIRContext *context) {

assert(context && "expected MLIR context");

StringRef layout = dataLayout.getStringRepresentation();

std::string layoutstr = dataLayout.getStringRepresentation();

// Remaining unhandled default layout defaults

// e (little endian if not set)

// p[n]:64:64:64 (non zero address spaces have 64-bit properties)

ftynseUnsubmitted

Not Done

std::string layoutstr = dataLayout.getStringRepresentation();

- // Remaining unhandled default layout defaults

- // e (little endian if not set)

- // p[n]:64:64:64 (non zero address spaces have 64-bit properties)

+ // Remaining unhandled default layout defaults:

+ // - e (little endian if not set)

+ // - p[n]:64:64:64 (non zero address spaces have 64-bit properties).

std::string append =

ftynse:

std::string append =

"p:64:64:64-S0-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f16:16:16-f64:"

"64:64-f128:128:128-v64:64:64-v128:128:128-a:0:64";

if (layoutstr.empty())

layoutstr = append;

else

layoutstr = layoutstr + "-" + append;

StringRef layout(layoutstr);

SmallVector<DataLayoutEntryInterface> entries;

StringSet<> seen;

while (!layout.empty()) {

// Split at '-'.

std::pair<StringRef, StringRef> split = layout.split('-');

StringRef current;

std::tie(current, layout) = split;

// Split at ':'.

StringRef kind, spec;

std::tie(kind, spec) = current.split(':');

if (seen.contains(kind))

continue;

seen.insert(kind);

char symbol = kind.front();

StringRef parameter = kind.substr(1);

if (symbol == 'i' || symbol == 'f') {

unsigned bitwidth;

if (parameter.getAsInteger(/*Radix=*/10, bitwidth))