Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 19:48:20 +02:00
Code Activity

Added bitcode emission, additional logging

Browse source
This commit is contained in:
Brian Fiete 2019-10-29 04:56:42 -07:00
parent 1e8c633a36
commit 43b69023f6
14 changed files with 74 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BeefLibs/Beefy2D/src/widgets/EditWidget.bf
View file

@ -1148,7 +1148,7 @@ namespace Beefy.widgets
doCheck = false;
for (char32 c in theString.DecodedChars)
{
if (c <= (char32)128)
if (c < (char32)128)
hasChar[(int)c] = true;
else if (!AllowChar(c))
{

3
BeefySysLib/platform/win/Platform.cpp
View file

@ -2435,7 +2435,8 @@ BFP_EXPORT void BFP_CALLTYPE BfpDirectory_Create(const char* path, BfpFileResult
UTF16String wPath = UTF8Decode(path);
if (!::CreateDirectoryW(wPath.c_str(), NULL))
{
switch (::GetLastError())
int lastError = ::GetLastError();
switch (lastError)
{
case ERROR_ALREADY_EXISTS:
OUTRESULT(BfpFileResult_AlreadyExists);

12
IDE/src/Compiler/BfCompiler.bf
View file

@ -21,7 +21,7 @@ namespace IDE.Compiler
EmitLineInfo = 2,
WriteIR = 4,
GenerateOBJ = 8,
NoFramePointerElim = 0x10,
GenerateBitcode = 0x10,
ClearLocalVars = 0x20,
RuntimeChecks = 0x40,
EmitDynamicCastCheck = 0x80,
@ -32,7 +32,9 @@ namespace IDE.Compiler
EnableSideStack = 0x1000,
EnableHotSwapping = 0x2000,
IncrementalBuild = 0x4000,
DebugAlloc = 0x8000
DebugAlloc = 0x8000,
OmitDebugHelpers = 0x10000,
NoFramePointerElim = 0x20000,
}
[StdCall, CLink]
@ -491,8 +493,10 @@ namespace IDE.Compiler
}
else
{
SetOpt((options.mIntermediateType == .IRCode) || (options.mIntermediateType == .ObjectAndIRCode), .WriteIR);
SetOpt((options.mIntermediateType == .Object) || (options.mIntermediateType == .ObjectAndIRCode), .GenerateOBJ);
SetOpt((options.mIntermediateType == .IRCode) || (options.mIntermediateType == .ObjectAndIRCode) || (options.mIntermediateType == .BitcodeAndIRCode), .WriteIR);
SetOpt((options.mIntermediateType == .Object) || (options.mIntermediateType == .ObjectAndIRCode) ||
(options.mIntermediateType == .Bitcode) || (options.mIntermediateType == .BitcodeAndIRCode), .GenerateOBJ);
SetOpt((options.mIntermediateType == .Bitcode) || (options.mIntermediateType == .BitcodeAndIRCode), .GenerateBitcode);
}
SetOpt(options.mNoOmitFramePointers, .NoFramePointerElim);
SetOpt(options.mInitLocalVariables, .ClearLocalVars);

4
IDE/src/Compiler/BfParser.bf
View file

@ -158,10 +158,6 @@ namespace IDE.Compiler
public void SetSource(String data, String fileName)
{
if (fileName.Contains("main4.cs"))
{
}
Debug.Assert(!mIsUsed);
mIsUsed = true;
BfParser_SetSource(mNativeBfParser, data, (int32)data.Length, fileName);

8
IDE/src/Compiler/BfSystem.bf
View file

@ -79,6 +79,9 @@ namespace IDE.Compiler
[StdCall, CLink]
extern static void BfSystem_DbgPrintTimings();
[StdCall, CLink]
extern static void BfSystem_Log(void* bfSystem, char8* str);
public void* mNativeBfSystem;
public bool mIsTiming;
public Monitor mMonitor = new Monitor() ~ delete _;
@ -360,5 +363,10 @@ namespace IDE.Compiler
AddTypeOptions(typeOption.mFilter, typeOption.mBfSIMDSetting, typeOption.mBfOptimizationLevel, typeOption.mEmitDebugInfo, typeOption.mRuntimeChecks,
typeOption.mInitLocalVariables, typeOption.mEmitDynamicCastCheck, typeOption.mEmitObjectAccessCheck, typeOption.mAllocStackTraceDepth);
}
public void Log(String str)
{
BfSystem_Log(mNativeBfSystem, str);
}
}
}

16
IDE/src/IDEApp.bf
View file

@ -3775,6 +3775,8 @@ namespace IDE
[IDECommand]
void Compile()
{
CompilerLog("IDEApp.Compile");
if (AreTestsRunning())
return;
if (mHotResolveState != .None)
@ -6500,6 +6502,16 @@ namespace IDE
mOutputPanel.Write(outStr);
}
public void CompilerLog(String format, params Object[] args)
{
var str = scope String();
str..AppendF(format, params args);
if (mBfBuildSystem != null)
mBfBuildSystem.Log(str);
if (mBfResolveSystem != null)
mBfResolveSystem.Log(str);
}
public void OutputLine(String format, params Object[] args)
{
String outStr;
@ -8162,6 +8174,8 @@ namespace IDE
BfPassInstance CompileBeef(Project hotProject, int32 hotIdx, bool lastCompileHadMessages, out bool hadBeef)
{
CompilerLog("IDEApp.CompileBeef");
hadBeef = false;
mCompilingBeef = true;
BeefCompileStarted();
@ -11484,6 +11498,8 @@ namespace IDE
public void OnWatchedFileChanged(ProjectItem projectItem, WatcherChangeTypes changeType, String newPath)
{
CompilerLog("IDEApp.OnWatchedFileChanged {} {} {}", projectItem.mName, changeType, newPath);
ProjectListViewItem listViewItem;
mProjectPanel.mProjectToListViewMap.TryGetValue(projectItem, out listViewItem);

7
IDE/src/Workspace.bf
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
@ -17,7 +18,9 @@ namespace IDE
{
Object,
IRCode,
ObjectAndIRCode
ObjectAndIRCode,
Bitcode,
BitcodeAndIRCode,
}
public enum PlatformType
@ -748,7 +751,7 @@ namespace IDE
options.mIncrementalBuild = !isRelease;
options.mAllocStackTraceDepth = 1;
options.mIntermediateType = .Object;
options.mIntermediateType = (platformType == .iOS) ? .Bitcode : .Object;
options.mCSIMDSetting = .SSE2;
options.mCOptimizationLevel = isRelease ? .O2 : .O0;

2
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -8207,6 +8207,7 @@ BF_EXPORT void BF_CALLTYPE BfCompiler_SetOptions(BfCompiler* bfCompiler, BfProje
options->mIncrementalBuild = (optionFlags & BfCompilerOptionFlag_IncrementalBuild) != 0;
options->mWriteIR = (optionFlags & BfCompilerOptionFlag_WriteIR) != 0;
options->mGenerateObj = (optionFlags & BfCompilerOptionFlag_GenerateOBJ) != 0;
options->mGenerateBitcode = (optionFlags & BfCompilerOptionFlag_GenerateBitcode) != 0;
options->mNoFramePointerElim = (optionFlags & BfCompilerOptionFlag_NoFramePointerElim) != 0;
options->mInitLocalVariables = (optionFlags & BfCompilerOptionFlag_ClearLocalVars) != 0;
options->mRuntimeChecks = (optionFlags & BfCompilerOptionFlag_RuntimeChecks) != 0;
@ -8279,3 +8280,4 @@ BF_EXPORT void BF_CALLTYPE BfCompiler_ForceRebuild(BfCompiler* bfCompiler)
bfCompiler->mOptions.mForceRebuildIdx++;
}

3
IDEHelper/Compiler/BfCompiler.h
View file

@ -99,7 +99,6 @@ public:
int mCLongSize;
BfToolsetType mToolsetType;
BfSIMDSetting mSIMDSetting;
int mMaxWorkerThreads;
String mMallocLinkName;
String mFreeLinkName;
bool mIncrementalBuild;
@ -127,6 +126,7 @@ public:
bool mWriteIR;
bool mGenerateObj;
bool mGenerateBitcode;
int mAllocStackCount;
bool mExtraResolveChecks;
@ -164,6 +164,7 @@ public:
mEnableRealtimeLeakCheck = false;
mWriteIR = false;
mGenerateObj = true;
mGenerateBitcode = false;
mEnableCustodian = false;
mEnableSideStack = false;
mHasVDataExtender = false;

8
IDEHelper/Compiler/BfIRCodeGen.cpp
View file

@ -4071,7 +4071,7 @@ bool BfIRCodeGen::WriteObjectFile(const StringImpl& outFileName, const BfCodeGen
llvm::raw_fd_ostream* outStream = NULL;
defer ( delete outStream; );
if (enableLTO)
if ((enableLTO) || (codeGenOptions.mWriteBitcode))
{
std::error_code ec;
outStream = new llvm::raw_fd_ostream(outFileName.c_str(), ec, llvm::sys::fs::F_None);
@ -4080,8 +4080,10 @@ bool BfIRCodeGen::WriteObjectFile(const StringImpl& outFileName, const BfCodeGen
return false;
}
//PM.add()
if (enableLTO)
PM.add(createWriteThinLTOBitcodePass(*outStream, NULL));
else
PM.add(createBitcodeWriterPass(*outStream, false, false, false));
}
//TargetPassConfig *PassConfig = target->createPassConfig(PM);
@ -4105,7 +4107,7 @@ bool BfIRCodeGen::WriteObjectFile(const StringImpl& outFileName, const BfCodeGen
//WriteBitcode
bool noVerify = false; // Option
if (!enableLTO)
if ((!enableLTO) && (!codeGenOptions.mWriteBitcode))
{
// Ask the target to add backend passes as necessary.
if (target->addPassesToEmitFile(PM, out, NULL,

3
IDEHelper/Compiler/BfModule.cpp
View file

@ -20478,6 +20478,7 @@ bool BfModule::Finish()
codeGenOptions.mSIMDSetting = moduleOptions.mSIMDSetting;
codeGenOptions.mWriteLLVMIR = mCompiler->mOptions.mWriteIR;
codeGenOptions.mWriteObj = mCompiler->mOptions.mGenerateObj;
codeGenOptions.mWriteBitcode = mCompiler->mOptions.mGenerateBitcode;
codeGenOptions.mVirtualMethodOfs = 1 + mCompiler->GetDynCastVDataCount() + mCompiler->mMaxInterfaceSlots;
codeGenOptions.mDynSlotOfs = mSystem->mPtrSize - mCompiler->GetDynCastVDataCount() * 4;
@ -20525,7 +20526,7 @@ bool BfModule::Finish()
{
moduleFileName.mFileName = irOutputPath;
}
else if ((!mCompiler->mOptions.mGenerateObj) && (!mCompiler->mOptions.mWriteIR))
else if ((!mCompiler->mOptions.mGenerateObj) && (!mCompiler->mOptions.mGenerateBitcode) && (!mCompiler->mOptions.mWriteIR))
{
BF_FATAL("Neither obj nor IR specified");
}

8
IDEHelper/Compiler/BfSystem.cpp
View file

@ -3290,7 +3290,7 @@ BF_EXPORT void BF_CALLTYPE BfSystem_DeleteParser(BfSystem* bfSystem, BfParser* b
{
for (auto typeDef : bfParser->mTypeDefs)
{
BfLogSys(bfSystem, "BfSystem_DeleteParser deleting typeDef %p\n", typeDef);
BfLogSys(bfSystem, "BfSystem_DeleteParser %p deleting typeDef %p\n", bfParser, typeDef);
typeDef->mDefState = BfTypeDef::DefState_Deleted;
}
}
@ -3815,3 +3815,9 @@ BF_EXPORT void BF_CALLTYPE BfSystem_FixTypes(BfSystem* bfSystem)
fixTypesHelper.mBfSystem = bfSystem;
fixTypesHelper.Fix();
}
BF_EXPORT void BF_CALLTYPE BfSystem_Log(BfSystem* bfSystem, char* str)
{
BfLogSys(bfSystem, str);
BfLogSys(bfSystem, "\n");
}

7
IDEHelper/Compiler/BfSystem.h
View file

@ -143,7 +143,7 @@ enum BfCompilerOptionFlags
BfCompilerOptionFlag_EmitLineInfo = 2,
BfCompilerOptionFlag_WriteIR = 4,
BfCompilerOptionFlag_GenerateOBJ = 8,
BfCompilerOptionFlag_NoFramePointerElim = 0x10,
BfCompilerOptionFlag_GenerateBitcode = 0x10,
BfCompilerOptionFlag_ClearLocalVars = 0x20,
BfCompilerOptionFlag_RuntimeChecks = 0x40,
BfCompilerOptionFlag_EmitDynamicCastCheck = 0x80,
@ -155,7 +155,8 @@ enum BfCompilerOptionFlags
BfCompilerOptionFlag_EnableHotSwapping = 0x2000,
BfCompilerOptionFlag_IncrementalBuild = 0x4000,
BfCompilerOptionFlag_DebugAlloc = 0x8000,
BfCompilerOptionFlag_OmitDebugHelpers = 0x10000
BfCompilerOptionFlag_OmitDebugHelpers = 0x10000,
BfCompilerOptionFlag_NoFramePointerElim = 0x20000,
};
enum BfTypeFlags
@ -300,6 +301,7 @@ struct BfCodeGenOptions
bool mIsHotCompile;
bool mWriteObj;
bool mWriteBitcode;
BfAsmKind mAsmKind;
bool mWriteToLib;
bool mWriteLLVMIR;
@ -354,6 +356,7 @@ struct BfCodeGenOptions
{
mIsHotCompile = false;
mWriteObj = true;
mWriteBitcode = false;
mAsmKind = BfAsmKind_None;
mWriteToLib = false;
mWriteLLVMIR = false;