empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build: Simplify PGO builds and allow it to be used when building the libretro core

Browse source
This commit is contained in:
Sour 2018-12-31 14:59:00 -05:00
parent 2758e6f078
commit 2383499533
9 changed files with 95 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Core/Console.cpp
View file

@ -46,6 +46,7 @@
#include "NotificationManager.h"
#include "HistoryViewer.h"
#include "ConsolePauseHelper.h"
#include "PgoUtilities.h"
Console::Console(shared_ptr<Console> master, EmulationSettings* initialSettings)
{
@ -1486,3 +1487,9 @@ void Console::DisplayDebugInformation(Timer &clockTimer, Timer &lastFrameTimer,
_debugHud->DrawString(134, 48, ss.str(), 0xFFFFFF, 0xFF000000, 1, startFrame);
}
void Console::ExportStub()
{
//Force the compiler to export the PgoRunTest function - otherwise it seems to be ignored since it is unused
vector<string> testRoms;
PgoRunTest(testRoms, true);
}

2
Core/Console.h
View file

@ -103,6 +103,8 @@ private:
double GetFrameDelay();
void DisplayDebugInformation(Timer &clockTimer, Timer &lastFrameTimer, double &lastFrameMin, double &lastFrameMax, uint32_t lastPauseFrame);
void ExportStub();
public:
Console(shared_ptr<Console> master = nullptr, EmulationSettings* initialSettings = nullptr);
~Console();

2
Core/Core.vcxproj
View file

@ -954,6 +954,7 @@
<ClInclude Include="WaveRecorder.h" />
<ClInclude Include="Yoko.h" />
<ClInclude Include="Zapper.h" />
<ClInclude Include="PgoUtilities.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="APU.cpp" />
@ -984,6 +985,7 @@
<ClCompile Include="NsfPpu.cpp" />
<ClCompile Include="OggMixer.cpp" />
<ClCompile Include="OggReader.cpp" />
<ClCompile Include="PgoUtilities.cpp" />
<ClCompile Include="RawVideoFilter.cpp" />
<ClCompile Include="RecordedRomTest.cpp" />
<ClCompile Include="AutoSaveManager.cpp" />

6
Core/Core.vcxproj.filters
View file

@ -1767,5 +1767,11 @@
<ClCompile Include="StereoCombFilter.cpp">
<Filter>Nes\APU\Filters</Filter>
</ClCompile>
<ClCompile Include="PgoUtilities.h">
<Filter>Misc</Filter>
</ClCompile>
<ClCompile Include="PgoUtilities.cpp">
<Filter>Misc</Filter>
</ClCompile>
</ItemGroup>
</Project>

38
Core/PgoUtilities.cpp Normal file
View file

@ -0,0 +1,38 @@
#include "stdafx.h"
#include <thread>
#include "PgoUtilities.h"
#include "Types.h"
#include "Debugger.h"
#include "DebuggerTypes.h"
#include "Console.h"
#include "../Utilities/FolderUtilities.h"
extern "C" {
void __stdcall PgoRunTest(vector<string> testRoms, bool enableDebugger)
{
const VideoFilterType filterTypes[13] = { VideoFilterType::BisqwitNtscQuarterRes, VideoFilterType::HQ2x, VideoFilterType::HQ3x, VideoFilterType::HQ4x, VideoFilterType::NTSC, VideoFilterType::Scale2x, VideoFilterType::Scale3x, VideoFilterType::Scale4x, VideoFilterType::xBRZ2x, VideoFilterType::xBRZ3x, VideoFilterType::xBRZ4x, VideoFilterType::xBRZ5x, VideoFilterType::xBRZ6x };
FolderUtilities::SetHomeFolder("../PGOMesenHome");
for(size_t i = 0; i < testRoms.size(); i++) {
std::cout << "Running: " << testRoms[i] << std::endl;
shared_ptr<Console> console(new Console());
console->Init();
console->Initialize(testRoms[i]);
console->GetSettings()->SetFlags(EmulationFlags::ConsoleMode | EmulationFlags::UseHdPacks);
console->GetSettings()->SetVideoFilterType(filterTypes[i % 13]);
if(enableDebugger) {
console->GetDebugger(true)->SetFlags((uint32_t)DebuggerFlags::BreakOnFirstCycle);
}
thread testThread([&console] {
console->Run();
});
std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(5000));
console->Stop();
testThread.join();
console->Release(true);
}
}
}

14
Core/PgoUtilities.h Normal file
View file

@ -0,0 +1,14 @@
#pragma once
#include "stdafx.h"
extern "C" {
#if _WIN32 || _WIN64
#define DllExport2 __declspec(dllexport)
#else
#define DllExport2 __attribute__((visibility("default")))
#define __stdcall
#endif
DllExport2 void __stdcall PgoRunTest(vector<string> testRoms, bool enableDebugger);
}

89
PGOHelper/PGOHelper.cpp
View file

@ -1,69 +1,18 @@
#ifdef _WIN32
#else
#define __stdcall
#endif
#include <iostream>
#include <thread>
#include <vector>
#include <string>
#include <algorithm>
#include <unordered_set>
#include <experimental/filesystem>
#include "../Core/PgoUtilities.h"
namespace fs = std::experimental::filesystem;
using std::string;
using std::vector;
using std::thread;
enum class VideoFilterType
{
None = 0,
NTSC = 1,
BisqwitNtscQuarterRes = 2,
BisqwitNtscHalfRes = 3,
BisqwitNtsc = 4,
xBRZ2x = 5,
xBRZ3x = 6,
xBRZ4x = 7,
xBRZ5x = 8,
xBRZ6x = 9,
HQ2x = 10,
HQ3x = 11,
HQ4x = 12,
Scale2x = 13,
Scale3x = 14,
Scale4x = 15,
_2xSai = 16,
Super2xSai = 17,
SuperEagle = 18,
Prescale2x = 19,
Prescale3x = 20,
Prescale4x = 21,
Prescale6x = 22,
Prescale8x = 23,
Prescale10x = 24,
HdPack = 999
};
extern "C" {
void __stdcall SetFlags(uint64_t flags);
void __stdcall SetVideoFilter(VideoFilterType filter);
void __stdcall InitDll();
void __stdcall InitializeEmu(const char* homeFolder, void*, void*, bool, bool, bool);
void __stdcall LoadROM(const char* filename, const char* patchFile);
void __stdcall Run();
void __stdcall Release();
void __stdcall Stop();
void __stdcall DebugInitialize();
void __stdcall DebugSetFlags(uint32_t flags);
}
vector<string> GetFilesInFolder(string rootFolder, std::unordered_set<string> extensions)
{
vector<string> files;
vector<string> folders = { { rootFolder } };
std::error_code errorCode;
if(!fs::is_directory(fs::u8path(rootFolder), errorCode)) {
return files;
@ -84,35 +33,13 @@ vector<string> GetFilesInFolder(string rootFolder, std::unordered_set<string> ex
int main(int argc, char* argv[])
{
vector<string> testRoms = GetFilesInFolder("../PGOGames", { ".nes" });
string romFolder = "../PGOGames";
if(argc >= 2) {
romFolder = argv[1];
}
string homeFolder = "../PGOMesenHome";
InitDll();
SetFlags(0x8000000000000000 | 0x20); //EmulationFlags::ConsoleMode | UseHdPacks
InitializeEmu(homeFolder.c_str(), nullptr, nullptr, false, false, false);
LoadROM(testRoms[0].c_str(), "");
std::cout << "Running: " << testRoms[0] << std::endl;
thread testThread([testRoms] {
VideoFilterType filterTypes[13] = {
VideoFilterType::BisqwitNtscQuarterRes, VideoFilterType::HQ2x, VideoFilterType::HQ3x, VideoFilterType::HQ4x, VideoFilterType::NTSC, VideoFilterType::Scale2x, VideoFilterType::Scale3x, VideoFilterType::Scale4x, VideoFilterType::xBRZ2x, VideoFilterType::xBRZ3x, VideoFilterType::xBRZ4x, VideoFilterType::xBRZ5x, VideoFilterType::xBRZ6x
};
for(size_t i = 1; i < testRoms.size(); i++) {
std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(5000));
std::cout << "Running: " << testRoms[i] << std::endl;
SetVideoFilter(filterTypes[i % 13]);
LoadROM(testRoms[i].c_str(), "");
DebugInitialize();
DebugSetFlags(0x10000 /*DebuggerFlags::BreakOnFirstCycle*/);
}
std::this_thread::sleep_for(std::chrono::duration<int, std::milli>(5000));
Stop();
Release();
});
Run();
testThread.join();
vector<string> testRoms = GetFilesInFolder(romFolder, { {".nes"} });
PgoRunTest(testRoms, true);
return 0;
}

22
buildPGO.sh
View file

@ -14,27 +14,27 @@
# Note: While GCC runs through this script just fine, the runtime performance is pretty terrible (something must be wrong with the way this is built)
#
# This will produce the following binary: bin/x64/Release/Mesen.exe
if [ "$BUILDTARGET" = core ]; then
TARG="core"
else
TARG=""
fi
if [ "$MESENPLATFORM" = x86 ]; then
PLAT="x86"
else
PLAT="x64"
fi
if [ "$BUILDTARGET" = libretro ]; then
TARG="libretro"
else
TARG="core"
fi
OBJ="PGOHelper/obj.${PLAT}/"
FLAGS="LTO=true MESENPLATFORM=${PLAT}"
eval ${FLAGS} make clean
#create instrumented binary
eval ${FLAGS} PGO=profile make pgohelper -j 16
eval cp InteropDLL/obj.${PLAT}/libMesenCore.${PLAT}.dll ${OBJ}
eval ${FLAGS} PGO=profile make ${TARG} -j 16
eval ${FLAGS} PGO=profile make pgohelper -B
eval cp bin/pgohelperlib.so ${OBJ}
#run the instrumented binary
cd ${OBJ}
@ -50,6 +50,10 @@ else
cd ..
fi
if [ "$BUILDTARGET" = "" ]; then
TARG=""
fi
#rebuild using the profiling data to optimize
eval ${FLAGS} PGO=optimize make ${TARG} -j 16 -B

8
makefile
View file

@ -112,8 +112,8 @@ testhelper: InteropDLL/$(OBJFOLDER)/$(SHAREDLIB)
$(CPPC) $(GCCOPTIONS) -Wl,-z,defs -o testhelper TestHelper/*.cpp InteropDLL/ConsoleWrapper.cpp $(SEVENZIPOBJ) $(LUAOBJ) $(LINUXOBJ) $(LIBEVDEVOBJ) $(UTILOBJ) $(COREOBJ) -pthread $(FSLIB) $(SDL2LIB) $(LIBEVDEVLIB)
mv testhelper TestHelper/$(OBJFOLDER)
pgohelper: InteropDLL/$(OBJFOLDER)/$(SHAREDLIB)
mkdir -p PGOHelper/$(OBJFOLDER) && cd PGOHelper/$(OBJFOLDER) && $(CPPC) $(GCCOPTIONS) -Wl,-z,defs -o pgohelper ../PGOHelper.cpp ../../InteropDLL/$(OBJFOLDER)/$(SHAREDLIB) -pthread $(FSLIB) $(SDL2LIB) $(LIBEVDEVLIB)
pgohelper:
mkdir -p PGOHelper/$(OBJFOLDER) && cd PGOHelper/$(OBJFOLDER) && $(CPPC) $(GCCOPTIONS) -Wl,-z,defs -o pgohelper ../PGOHelper.cpp ../../bin/pgohelperlib.so -pthread $(FSLIB) $(SDL2LIB) $(LIBEVDEVLIB)
SevenZip/$(OBJFOLDER)/%.o: SevenZip/%.c
mkdir -p SevenZip/$(OBJFOLDER) && cd SevenZip/$(OBJFOLDER) && $(CC) $(CCOPTIONS) -c $(patsubst SevenZip/%, ../%, $<)
@ -139,11 +139,13 @@ Linux/$(OBJFOLDER)/%.o: Linux/libevdev/%.c
InteropDLL/$(OBJFOLDER)/$(SHAREDLIB): $(SEVENZIPOBJ) $(LUAOBJ) $(UTILOBJ) $(COREOBJ) $(LIBEVDEVOBJ) $(LINUXOBJ) InteropDLL/ConsoleWrapper.cpp InteropDLL/DebugWrapper.cpp
mkdir -p InteropDLL/$(OBJFOLDER)
$(CPPC) $(GCCOPTIONS) -Wl,-z,defs -shared -o $(SHAREDLIB) InteropDLL/*.cpp $(SEVENZIPOBJ) $(LUAOBJ) $(LINUXOBJ) $(LIBEVDEVOBJ) $(UTILOBJ) $(COREOBJ) $(SDL2INC) -pthread $(FSLIB) $(SDL2LIB) $(LIBEVDEVLIB)
cp $(SHAREDLIB) bin/pgohelperlib.so
mv $(SHAREDLIB) InteropDLL/$(OBJFOLDER)
Libretro/$(OBJFOLDER)/$(LIBRETROLIB): $(SEVENZIPOBJ) $(UTILOBJ) $(COREOBJ) $(LUAOBJ) Libretro/libretro.cpp
mkdir -p Libretro/$(OBJFOLDER)
$(CPPC) $(GCCOPTIONS) -Wl,-z,defs -shared -o $(LIBRETROLIB) Libretro/*.cpp $(SEVENZIPOBJ) $(UTILOBJ) $(COREOBJ) $(LUAOBJ) -pthread $(FSLIB)
cp $(LIBRETROLIB) bin/pgohelperlib.so
mv $(LIBRETROLIB) Libretro/$(OBJFOLDER)
pgo: