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

Ability to explicitly set target triple

Browse source
This commit is contained in:
Brian Fiete 2022-01-25 14:39:52 -05:00
parent 8ce94e7076
commit 37c4074c44
4 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -697,6 +697,8 @@ namespace IDE.Compiler
} }
//Debug.WriteLine("HandleOptions SetOptions:{0:X}", (int)optionFlags); //Debug.WriteLine("HandleOptions SetOptions:{0:X}", (int)optionFlags);
if (!options.mTargetTriple.IsWhiteSpace)
targetTriple.Set(options.mTargetTriple);
SetOptions(hotBfProject, hotIdx, SetOptions(hotBfProject, hotIdx,
targetTriple, options.mTargetCPU, (int32)options.mToolsetType, (int32)options.mBfSIMDSetting, (int32)options.mAllocStackTraceDepth, targetTriple, options.mTargetCPU, (int32)options.mToolsetType, (int32)options.mBfSIMDSetting, (int32)options.mAllocStackTraceDepth,

5
IDE/src/Workspace.bf
View file

@ -240,6 +240,8 @@ namespace IDE
[Reflect] [Reflect]
public IntermediateType mIntermediateType; public IntermediateType mIntermediateType;
[Reflect] [Reflect]
public String mTargetTriple = new String() ~ delete _;
[Reflect]
public String mTargetCPU = new String() ~ delete _; public String mTargetCPU = new String() ~ delete _;
[Reflect] [Reflect]
public BuildOptions.SIMDSetting mBfSIMDSetting = .SSE2; public BuildOptions.SIMDSetting mBfSIMDSetting = .SSE2;
@ -319,6 +321,7 @@ namespace IDE
mIncrementalBuild = prev.mIncrementalBuild; mIncrementalBuild = prev.mIncrementalBuild;
mIntermediateType = prev.mIntermediateType; mIntermediateType = prev.mIntermediateType;
mTargetTriple.Set(prev.mTargetTriple);
mTargetCPU.Set(prev.mTargetCPU); mTargetCPU.Set(prev.mTargetCPU);
mBfSIMDSetting = prev.mBfSIMDSetting; mBfSIMDSetting = prev.mBfSIMDSetting;
mBfOptimizationLevel = prev.mBfOptimizationLevel; mBfOptimizationLevel = prev.mBfOptimizationLevel;
@ -741,6 +744,7 @@ namespace IDE
data.ConditionalAdd("Toolset", options.mToolsetType, ToolsetType.GetDefaultFor(platformType, isRelease)); data.ConditionalAdd("Toolset", options.mToolsetType, ToolsetType.GetDefaultFor(platformType, isRelease));
data.ConditionalAdd("BuildKind", options.mBuildKind, isTest ? .Test : .Normal); data.ConditionalAdd("BuildKind", options.mBuildKind, isTest ? .Test : .Normal);
data.ConditionalAdd("TargetTriple", options.mTargetTriple);
data.ConditionalAdd("TargetCPU", options.mTargetCPU); data.ConditionalAdd("TargetCPU", options.mTargetCPU);
data.ConditionalAdd("BfSIMDSetting", options.mBfSIMDSetting, .SSE2); data.ConditionalAdd("BfSIMDSetting", options.mBfSIMDSetting, .SSE2);
if (platformType == .Windows) if (platformType == .Windows)
@ -1045,6 +1049,7 @@ namespace IDE
options.mToolsetType = data.GetEnum<ToolsetType>("Toolset", ToolsetType.GetDefaultFor(platformType, isRelease)); options.mToolsetType = data.GetEnum<ToolsetType>("Toolset", ToolsetType.GetDefaultFor(platformType, isRelease));
options.mBuildKind = data.GetEnum<BuildKind>("BuildKind", isTest ? .Test : .Normal); options.mBuildKind = data.GetEnum<BuildKind>("BuildKind", isTest ? .Test : .Normal);
data.GetString("TargetTriple", options.mTargetTriple);
data.GetString("TargetCPU", options.mTargetCPU); data.GetString("TargetCPU", options.mTargetCPU);
options.mBfSIMDSetting = data.GetEnum<BuildOptions.SIMDSetting>("BfSIMDSetting", .SSE2); options.mBfSIMDSetting = data.GetEnum<BuildOptions.SIMDSetting>("BfSIMDSetting", .SSE2);
if (platformType == .Windows) if (platformType == .Windows)

1
IDE/src/ui/WorkspaceProperties.bf
View file

@ -775,6 +775,7 @@ namespace IDE.ui
return false; return false;
}); });
allocPropEntry.mOnUpdate(); allocPropEntry.mOnUpdate();
AddPropertiesItem(category, "Target Triple", "mTargetTriple");
AddPropertiesItem(category, "Target CPU", "mTargetCPU"); AddPropertiesItem(category, "Target CPU", "mTargetCPU");
AddPropertiesItem(category, "SIMD Instructions", "mBfSIMDSetting"); AddPropertiesItem(category, "SIMD Instructions", "mBfSIMDSetting");
AddPropertiesItem(category, "Optimization Level", "mBfOptimizationLevel", AddPropertiesItem(category, "Optimization Level", "mBfOptimizationLevel",

9
IDEHelper/Backend/BeMCContext.cpp
View file

@ -16040,7 +16040,7 @@ BeMCOperand BeMCContext::AllocBinaryOp(BeMCInstKind instKind, const BeMCOperand&
} }
void BeMCContext::Generate(BeFunction* function) void BeMCContext::Generate(BeFunction* function)
{ {
BP_ZONE_F("BeMCContext::Generate %s", function->mName.c_str()); BP_ZONE_F("BeMCContext::Generate %s", function->mName.c_str());
mBeFunction = function; mBeFunction = function;
@ -16048,7 +16048,12 @@ void BeMCContext::Generate(BeFunction* function)
mModule = function->mModule; mModule = function->mModule;
if (!mModule->mTargetCPU.IsEmpty()) if (!mModule->mTargetCPU.IsEmpty())
mModule->mBeIRCodeGen->Fail(StrFormat("Cannot set Target CPU '%s' for +Og optimization. Considering compiling under a different optimization setting.", mModule->mTargetCPU.c_str())); mModule->mBeIRCodeGen->Fail(StrFormat("Cannot set Target CPU to '%s' for +Og optimization. Considering compiling under a different optimization setting.", mModule->mTargetCPU.c_str()));
if (mModule->mTargetTriple != "x86_64-pc-windows-msvc")
{
mModule->mBeIRCodeGen->Fail(StrFormat("Cannot set Target Triple to '%s' for +Og optimization. Considering compiling under a different optimization setting.", mModule->mTargetTriple.c_str()));
return;
}
//mDbgPreferredRegs[15] = X64Reg_RCX; //mDbgPreferredRegs[15] = X64Reg_RCX;
//mDbgPreferredRegs[7] = X64Reg_RCX; //mDbgPreferredRegs[7] = X64Reg_RCX;