This is an archive of the discontinued LLVM Phabricator instance.

Differential D17255

Restore the capability to manipulate datalayout from the C API
ClosedPublic

Authored by deadalnix on Feb 15 2016, 1:03 AM.

Details

Reviewers
Wallbraker
echristo
mehdi_amini
Commits
rG5590967610af: Restore the capability to manipulate datalayout from the C API
rL260936: Restore the capability to manipulate datalayout from the C API
Summary

This consist in variosu addition to the C API:

LLVMTargetDataRef LLVMGetModuleDataLayout(LLVMModuleRef M);
void LLVMSetModuleDataLayout(LLVMModuleRef M, LLVMTargetDataRef DL);
LLVMTargetDataRef LLVMCreateTargetMachineData(LLVMTargetMachineRef T);

This also removes LLVMAddTargetData, which does nothing and is historical cruft.

Diff Detail

Repository
rL LLVM

Event Timeline

deadalnix updated this revision to Diff 47957.Feb 15 2016, 1:03 AM
deadalnix retitled this revision from to Restore the capability to manipulate datalayout from the C API.
deadalnix updated this object.
deadalnix added reviewers: mehdi_amini, Wallbraker, echristo.
Herald added a subscriber: axw. · View Herald TranscriptFeb 15 2016, 1:03 AM
mehdi_amini added inline comments.Feb 15 2016, 1:54 PM
include/llvm-c/Target.h
191 ↗(On Diff #47957)

Not clear why it isn't at the same place as LLVMGetDataLayout

194 ↗(On Diff #47957)

Separate change?

195 ↗(On Diff #47957)

comment seems wrong

203 ↗(On Diff #47957)

split code motion in a separate patch (you may commit it and rebase this one).

include/llvm-c/TargetMachine.h
91 ↗(On Diff #47957)

remove

include/llvm/IR/DataLayout.h
471 ↗(On Diff #47957)

do not mix formatting change with other changes please

lib/IR/Core.cpp
166 ↗(On Diff #47957)

Are you planning to deprecate this? Why a new duplicated API?

173 ↗(On Diff #47957)

You can commit this change separately now.

lib/Target/TargetMachineC.cpp
177 ↗(On Diff #47957)

I don't really like how we're not consistent on the naming. "Data" instead of "DataLayout" has always bothered me.
(Just mentioning, not your fault).

mehdi_amini edited edge metadata.Feb 15 2016, 1:55 PM

Oh, and since it is your domain: what about the tests?
Can you add a triple and a random data layout (not the default one) to the echo test?

deadalnix added inline comments.Feb 15 2016, 3:38 PM
include/llvm-c/Target.h
191 ↗(On Diff #47957)

LLVMGetDataLayout really should be named LLVMGetDataLayoutStr as it maps getDataLayourStr, which is the string representation of the layout.

lib/IR/Core.cpp
166 ↗(On Diff #47957)

Yes, the name is not only plain wrong but is also the name of anther method that does something else, which is confusing.

173 ↗(On Diff #47957)

Got you. Will do.

lib/Target/TargetMachineC.cpp
177 ↗(On Diff #47957)

Agreed. Problem is, the good names are taken here already, so I had to come up with something.

mehdi_amini added inline comments.Feb 15 2016, 3:41 PM
include/llvm-c/Target.h
191 ↗(On Diff #47957)

This is a getter on the module right? I'm asking about the location in the header: why here and not in include/llvm-c/Core.h where the other getter for Module are?

lib/IR/Core.cpp
166 ↗(On Diff #47957)

So mark it deprecated with a mention to use the other one. Also this sounds like a separate change to the C API (i.e. I'd say a separate review).

lib/Target/TargetMachineC.cpp
177 ↗(On Diff #47957)

LLVMCreateTargetDataLayout ? LLVMCreateDataLayoutForTarget ?

deadalnix added inline comments.Feb 15 2016, 3:47 PM
include/llvm-c/Target.h
191 ↗(On Diff #47957)

Yes, but LLVMTargetDataRef is not available from Core.h and making it so would be a bigger change. Also, all LLVMTargetDataRef related method are here, so I don't think this is that much of an issue.

deadalnix updated this revision to Diff 48030.Feb 15 2016, 4:05 PM
deadalnix edited edge metadata.

Update as per comments

mehdi_amini added inline comments.Feb 15 2016, 4:11 PM
include/llvm-c/Target.h
191 ↗(On Diff #48030)

LLVMTargetDataRef is not available from Core.h

That's a good reason :)

195 ↗(On Diff #48030)

comment is still wrong?

lib/Target/TargetMachineC.cpp
177 ↗(On Diff #48030)

What about one of these name? (you haven't answered so I'm not even sure you saw it)

mehdi_amini added a comment.Feb 15 2016, 4:13 PM

I also asked earlier about adding a data layout and a triple in the "echo" test?

deadalnix updated this revision to Diff 48032.Feb 15 2016, 4:16 PM

Fix comment
Update name

deadalnix updated this revision to Diff 48040.Feb 15 2016, 4:41 PM

Add check in the echo C API test

mehdi_amini accepted this revision.Feb 15 2016, 4:43 PM
mehdi_amini edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Feb 15 2016, 4:43 PM
Closed by commit rL260936: Restore the capability to manipulate datalayout from the C API (authored by deadalnix). · Explain WhyFeb 15 2016, 9:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
include/
llvm-c/
14 lines
3 lines
lib/
Target/
8 lines
4 lines
test/
Bindings/
llvm-c/
3 lines
tools/
llvm-c-test/
6 lines

Diff 48044

llvm/trunk/include/llvm-c/Target.h

Show First 20 Lines • Show All 177 Lines • ▼ Show 20 Lines#ifdef LLVM_NATIVE_DISASSEMBLER
return 0; return 0;
#else #else
return 1; return 1;
#endif #endif
} }
/*===-- Target Data -------------------------------------------------------===*/ /*===-- Target Data -------------------------------------------------------===*/
/**
* Obtain the data layout for a module.
*
* @see Module::getDataLayout()
*/
LLVMTargetDataRef LLVMGetModuleDataLayout(LLVMModuleRef M);
/**
* Set the data layout for a module.
*
* @see Module::setDataLayout()
*/
void LLVMSetModuleDataLayout(LLVMModuleRef M, LLVMTargetDataRef DL);
/** Creates target data from a target layout string. /** Creates target data from a target layout string.
See the constructor llvm::DataLayout::DataLayout. */ See the constructor llvm::DataLayout::DataLayout. */
LLVMTargetDataRef LLVMCreateTargetData(const char *StringRep); LLVMTargetDataRef LLVMCreateTargetData(const char *StringRep);
/** Adds target library information to a pass manager. This does not take /** Adds target library information to a pass manager. This does not take
ownership of the target library info. ownership of the target library info.
See the method llvm::PassManagerBase::add. */ See the method llvm::PassManagerBase::add. */
void LLVMAddTargetLibraryInfo(LLVMTargetLibraryInfoRef TLI, void LLVMAddTargetLibraryInfo(LLVMTargetLibraryInfoRef TLI,
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines

llvm/trunk/include/llvm-c/TargetMachine.h

Show First 20 Lines • Show All 109 Lines • ▼ Show 20 Lines/** Returns the cpu used creating this target machine. See
LLVMDisposeMessage. */ LLVMDisposeMessage. */
char *LLVMGetTargetMachineCPU(LLVMTargetMachineRef T); char *LLVMGetTargetMachineCPU(LLVMTargetMachineRef T);
/** Returns the feature string used creating this target machine. See /** Returns the feature string used creating this target machine. See
llvm::TargetMachine::getFeatureString. The result needs to be disposed with llvm::TargetMachine::getFeatureString. The result needs to be disposed with
LLVMDisposeMessage. */ LLVMDisposeMessage. */
char *LLVMGetTargetMachineFeatureString(LLVMTargetMachineRef T); char *LLVMGetTargetMachineFeatureString(LLVMTargetMachineRef T);
/** Create a DataLayout based on the targetMachine. */
LLVMTargetDataRef LLVMCreateTargetDataLayout(LLVMTargetMachineRef T);
/** Set the target machine's ASM verbosity. */ /** Set the target machine's ASM verbosity. */
void LLVMSetTargetMachineAsmVerbosity(LLVMTargetMachineRef T, void LLVMSetTargetMachineAsmVerbosity(LLVMTargetMachineRef T,
LLVMBool VerboseAsm); LLVMBool VerboseAsm);
/** Emits an asm or object file for the given module to the filename. This /** Emits an asm or object file for the given module to the filename. This
wraps several c++ only classes (among them a file stream). Returns any wraps several c++ only classes (among them a file stream). Returns any
error in ErrorMessage. Use LLVMDisposeMessage to dispose the message. */ error in ErrorMessage. Use LLVMDisposeMessage to dispose the message. */
LLVMBool LLVMTargetMachineEmitToFile(LLVMTargetMachineRef T, LLVMModuleRef M, LLVMBool LLVMTargetMachineEmitToFile(LLVMTargetMachineRef T, LLVMModuleRef M,
Show All 19 Lines

llvm/trunk/lib/Target/Target.cpp

Show All 36 Linesvoid llvm::initializeTarget(PassRegistry &Registry) {
initializeTargetLibraryInfoWrapperPassPass(Registry); initializeTargetLibraryInfoWrapperPassPass(Registry);
initializeTargetTransformInfoWrapperPassPass(Registry); initializeTargetTransformInfoWrapperPassPass(Registry);
} }
void LLVMInitializeTarget(LLVMPassRegistryRef R) { void LLVMInitializeTarget(LLVMPassRegistryRef R) {
initializeTarget(*unwrap(R)); initializeTarget(*unwrap(R));
} }
LLVMTargetDataRef LLVMGetModuleDataLayout(LLVMModuleRef M) {
return wrap(&unwrap(M)->getDataLayout());
}
void LLVMSetModuleDataLayout(LLVMModuleRef M, LLVMTargetDataRef DL) {
unwrap(M)->setDataLayout(*unwrap(DL));
}
LLVMTargetDataRef LLVMCreateTargetData(const char *StringRep) { LLVMTargetDataRef LLVMCreateTargetData(const char *StringRep) {
return wrap(new DataLayout(StringRep)); return wrap(new DataLayout(StringRep));
} }
void LLVMAddTargetLibraryInfo(LLVMTargetLibraryInfoRef TLI, void LLVMAddTargetLibraryInfo(LLVMTargetLibraryInfoRef TLI,
LLVMPassManagerRef PM) { LLVMPassManagerRef PM) {
unwrap(PM)->add(new TargetLibraryInfoWrapperPass(*unwrap(TLI))); unwrap(PM)->add(new TargetLibraryInfoWrapperPass(*unwrap(TLI)));
} }
▲ Show 20 Lines • Show All 78 Lines • Show Last 20 Lines

llvm/trunk/lib/Target/TargetMachineC.cpp

Show First 20 Lines • Show All 165 Lines • ▼ Show 20 Lineschar* LLVMGetTargetMachineFeatureString(LLVMTargetMachineRef T) {
return strdup(StringRep.c_str()); return strdup(StringRep.c_str());
} }
void LLVMSetTargetMachineAsmVerbosity(LLVMTargetMachineRef T, void LLVMSetTargetMachineAsmVerbosity(LLVMTargetMachineRef T,
LLVMBool VerboseAsm) { LLVMBool VerboseAsm) {
unwrap(T)->Options.MCOptions.AsmVerbose = VerboseAsm; unwrap(T)->Options.MCOptions.AsmVerbose = VerboseAsm;
} }
LLVMTargetDataRef LLVMCreateTargetDataLayout(LLVMTargetMachineRef T) {
return wrap(new DataLayout(unwrap(T)->createDataLayout()));
}
static LLVMBool LLVMTargetMachineEmit(LLVMTargetMachineRef T, LLVMModuleRef M, static LLVMBool LLVMTargetMachineEmit(LLVMTargetMachineRef T, LLVMModuleRef M,
raw_pwrite_stream &OS, raw_pwrite_stream &OS,
LLVMCodeGenFileType codegen, LLVMCodeGenFileType codegen,
char **ErrorMessage) { char **ErrorMessage) {
TargetMachine* TM = unwrap(T); TargetMachine* TM = unwrap(T);
Module* Mod = unwrap(M); Module* Mod = unwrap(M);
legacy::PassManager pass; legacy::PassManager pass;
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines

llvm/trunk/test/Bindings/llvm-c/echo.ll

; RUN: llvm-as < %s | llvm-dis > %t.orig ; RUN: llvm-as < %s | llvm-dis > %t.orig
; RUN: llvm-as < %s | llvm-c-test --echo > %t.echo ; RUN: llvm-as < %s | llvm-c-test --echo > %t.echo
; RUN: diff -w %t.orig %t.echo ; RUN: diff -w %t.orig %t.echo
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.11.0"
%S = type { i64, %S* } %S = type { i64, %S* }
define { i64, %S* } @unpackrepack(%S %s) { define { i64, %S* } @unpackrepack(%S %s) {
%1 = extractvalue %S %s, 0 %1 = extractvalue %S %s, 0
%2 = extractvalue %S %s, 1 %2 = extractvalue %S %s, 1
%3 = insertvalue { i64, %S* } undef, %S* %2, 1 %3 = insertvalue { i64, %S* } undef, %S* %2, 1
%4 = insertvalue { i64, %S* } %3, i64 %1, 0 %4 = insertvalue { i64, %S* } %3, i64 %1, 0
ret { i64, %S* } %4 ret { i64, %S* } %4
▲ Show 20 Lines • Show All 96 Lines • Show Last 20 Lines

llvm/trunk/tools/llvm-c-test/echo.cpp

Show All 10 Lines
// //
// This command uses the C API to read a module and output an exact copy of it // This command uses the C API to read a module and output an exact copy of it
// as output. It is used to check that the resulting module matches the input // as output. It is used to check that the resulting module matches the input
// to validate that the C API can read and write modules properly. // to validate that the C API can read and write modules properly.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm-c-test.h" #include "llvm-c-test.h"
#include "llvm-c/Target.h"
#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseMap.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
using namespace llvm; using namespace llvm;
▲ Show 20 Lines • Show All 597 Lines • ▼ Show 20 Lines
int llvm_echo(void) { int llvm_echo(void) {
LLVMEnablePrettyStackTrace(); LLVMEnablePrettyStackTrace();
LLVMModuleRef Src = llvm_load_module(false, true); LLVMModuleRef Src = llvm_load_module(false, true);
LLVMContextRef Ctx = LLVMContextCreate(); LLVMContextRef Ctx = LLVMContextCreate();
LLVMModuleRef M = LLVMModuleCreateWithNameInContext("<stdin>", Ctx); LLVMModuleRef M = LLVMModuleCreateWithNameInContext("<stdin>", Ctx);
LLVMSetTarget(M, LLVMGetTarget(Src));
LLVMSetModuleDataLayout(M, LLVMGetModuleDataLayout(Src));
if (strcmp(LLVMGetDataLayoutStr(M), LLVMGetDataLayoutStr(Src)))
report_fatal_error("Inconsistent DataLayout string representation");
clone_functions(Src, M); clone_functions(Src, M);
char *Str = LLVMPrintModuleToString(M); char *Str = LLVMPrintModuleToString(M);
fputs(Str, stdout); fputs(Str, stdout);
LLVMDisposeMessage(Str); LLVMDisposeMessage(Str);
LLVMDisposeModule(M); LLVMDisposeModule(M);
LLVMContextDispose(Ctx); LLVMContextDispose(Ctx);
return 0; return 0;
} }