Skip to content

Commit

Permalink
Node graph performance estimates
Browse files Browse the repository at this point in the history
  • Loading branch information
@Auburn
Auburn committed Aug 18, 2021
1 parent 70e1398 commit cfce4d8
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 50 deletions.
6 changes: 4 additions & 2 deletions CMakeSettings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,8 @@
"variables": [
{
"name": "CMAKE_CXX_FLAGS",
"value": "-m32"
"value": "-m32",
"type": "STRING"
},
{
"name": "FASTNOISE2_TESTS",
Expand All @@ -227,7 +228,8 @@
"variables": [
{
"name": "CMAKE_CXX_FLAGS",
"value": "-m32"
"value": "-m32",
"type": "STRING"
},
{
"name": "FASTNOISE2_TESTS",
Expand Down
153 changes: 119 additions & 34 deletions NoiseTool/FastNoiseNodeEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <imgui_internal.h>
#include <misc/cpp/imgui_stdlib.h>
#include <imnodes.h>
#include <sstream>

#include "FastNoiseNodeEditor.h"
#include "DemoNodeTrees.inl"
Expand Down Expand Up @@ -69,7 +70,7 @@ FastNoiseNodeEditor::Node::Node( FastNoiseNodeEditor& e, std::unique_ptr<FastNoi

void FastNoiseNodeEditor::Node::GeneratePreview( bool nodeTreeChanged )
{
static std::array<float, NoiseSize* NoiseSize> noiseData;
static std::array<float, NoiseSize * NoiseSize> noiseData;

serialised = FastNoise::Metadata::SerialiseNodeData( data.get(), true );
auto generator = FastNoise::NewFromEncodedNodeTree( serialised.c_str(), editor.mMaxSIMDLevel );
Expand All @@ -78,21 +79,24 @@ void FastNoiseNodeEditor::Node::GeneratePreview( bool nodeTreeChanged )
{
auto genRGB = FastNoise::New<FastNoise::ConvertRGBA8>( editor.mMaxSIMDLevel );
genRGB->SetSource( generator );

auto startTime = std::chrono::high_resolution_clock::now();

float frequency = editor.mNodeFrequency;
editor.GenerateNodePreviewNoise( genRGB.get(), noiseData.data() );

genRGB->GenUniformGrid2D( noiseData.data(), NoiseSize / -2, NoiseSize / -2, NoiseSize, NoiseSize, frequency, editor.mNodeSeed );
totalGenerateNs = std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - startTime ).count();
totalGenerateNs = std::max<int64_t>( 0, totalGenerateNs - editor.mConstantOverhead );
}
else
{
std::fill( noiseData.begin(), noiseData.end(), 0.0f );
serialised.clear();
totalGenerateNs = 0;
}

ImageView2D noiseImage( PixelFormat::RGBA8Unorm, { NoiseSize, NoiseSize }, noiseData );

noiseTexture.setStorage( 1, GL::TextureFormat::RGBA8, noiseImage.size() )
.setSubImage( 0, {}, noiseImage );
noiseTexture.setStorage( 1, GL::TextureFormat::RGBA8, noiseImage.size() ).setSubImage( 0, {}, noiseImage );

int myNodeId = GetNodeID();

Expand Down Expand Up @@ -133,6 +137,23 @@ std::vector<int> FastNoiseNodeEditor::Node::GetNodeIDLinks()
return links;
}

uint64_t Magnum::FastNoiseNodeEditor::Node::GetLocalGenerateNs()
{
int64_t localTotal = totalGenerateNs;

for( int link : GetNodeIDLinks() )
{
auto find = editor.mNodes.find( link );

if( find != editor.mNodes.end() )
{
localTotal -= find->second.totalGenerateNs;
}
}

return std::max<int64_t>( localTotal, 0 );
}

void FastNoiseNodeEditor::Node::SetNodeLink( int attributeId, FastNoise::NodeData* nodeData )
{
attributeId &= 15;
Expand Down Expand Up @@ -275,53 +296,69 @@ FastNoiseNodeEditor::FastNoiseNodeEditor()
metaDataGroup->items.emplace_back( mContextMetadata.emplace_back( new MetadataMenuItem( metadata ) ).get() );
std::sort( metaDataGroup->items.begin(), metaDataGroup->items.end(), menuSort );
}

BenchmarkOverhead();
}

void FastNoiseNodeEditor::BenchmarkOverhead()
{
// Benchmark node overhead
static std::array<float, Node::NoiseSize * Node::NoiseSize> noiseData;

mConstantOverhead = UINT64_MAX;
auto constant = FastNoise::New<FastNoise::Constant>( mMaxSIMDLevel );
auto rgb = FastNoise::New<FastNoise::ConvertRGBA8>( mMaxSIMDLevel );
rgb->SetSource( constant );

for( int i = 0; i < 16; i++ )
{
auto startTime = std::chrono::high_resolution_clock::now();

GenerateNodePreviewNoise( rgb.get(), noiseData.data() );

mConstantOverhead = std::min<uint64_t>( std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - startTime ).count(), mConstantOverhead );
}
}

void FastNoiseNodeEditor::Draw( const Matrix4& transformation, const Matrix4& projection, const Vector3& cameraPosition )
{
std::string simdTxt = "Current SIMD Level: ";
simdTxt += GetSIMDLevelName( mActualSIMDLevel );
ImGui::TextUnformatted( simdTxt.c_str() );

ImGui::SetNextWindowSize( ImVec2( 963, 634 ), ImGuiCond_FirstUseEver );
ImGui::SetNextWindowPos( ImVec2( 8, 439 ), ImGuiCond_FirstUseEver );
if( ImGui::Begin( "Node Editor" ) )
{
UpdateSelected();

bool edited = false;
ImGui::PushItemWidth( 60.0f );
ImGui::PushItemWidth( 82.0f );

edited |= ImGui::DragInt( "Seed", &mNodeSeed );
ImGui::SameLine();
edited |= ImGui::DragFloat( "Frequency", &mNodeFrequency, 0.001f );
edited |= ImGui::DragFloat( "Frequency", &mNodeFrequency, 0.001f );
ImGui::SameLine();

bool editedGenType = false;
editedGenType |= ImGui::Combo( "Generation Type", reinterpret_cast<int*>( &mNodeGenType ), NoiseTexture::GenTypeStrings );
editedGenType |= ImGuiExtra::ScrollCombo( reinterpret_cast<int*>( &mNodeGenType ), NoiseTexture::GenType_Count );

ImGui::PopItemWidth();

edited |= editedGenType;

if( editedGenType )
{
BenchmarkOverhead();
}
if( edited )
{
for( auto& node : mNodes )
{
node.second.GeneratePreview( false );
}
}
auto find = mNodes.find( mSelectedNode );

std::string serialised;


if( find != mNodes.end() )
{
serialised = find->second.serialised;
}

const char* serialisedLabel = "Encoded Node Tree";
const char* buttonLabel = "To CLI";
ImGui::SameLine();
ImGui::SetNextItemWidth( ImGui::GetContentRegionAvailWidth() - ImGui::CalcTextSize( serialisedLabel ).x - 210 - ImGui::CalcTextSize( buttonLabel ).x );
ImGui::InputText( serialisedLabel, serialised.data(), serialised.size(), ImGuiInputTextFlags_ReadOnly | ImGuiInputTextFlags_AutoSelectAll );
ImGui::SameLine();
if(ImGui::Button(buttonLabel))
printf("\n%s\n", serialised.data());

std::string simdTxt = "Current SIMD Level: ";
simdTxt += GetSIMDLevelName( mActualSIMDLevel );
ImGui::SameLine( ImGui::GetWindowContentRegionWidth() - ImGui::CalcTextSize( simdTxt.c_str() ).x );
ImGui::TextUnformatted( simdTxt.c_str() );
}

imnodes::BeginNodeEditor();

Expand Down Expand Up @@ -482,6 +519,8 @@ void FastNoiseNodeEditor::SetSIMDLevel( FastSIMD::eLevel lvl )
{
mMaxSIMDLevel = lvl;

BenchmarkOverhead();

for( auto& node : mNodes )
{
node.second.GeneratePreview();
Expand All @@ -497,12 +536,29 @@ void FastNoiseNodeEditor::DoNodes()
imnodes::BeginNodeTitleBar();
std::string formatName = FastNoise::Metadata::FormatMetadataNodeName( node.second.data->metadata );
ImGui::TextUnformatted( formatName.c_str() );

std::stringstream performanceStream;
performanceStream.precision( 3 );
performanceStream << node.second.GetLocalGenerateNs() / 1e+3 << "us";
std::string performanceString = performanceStream.str();

ImGui::SameLine( Node::NoiseSize - ImGui::CalcTextSize( performanceString.c_str() ).x );
ImGui::TextUnformatted( performanceString.c_str() );
imnodes::EndNodeTitleBar();

// Right click node title to change node type
ImGui::PushStyleVar( ImGuiStyleVar_WindowPadding, ImVec2( 4, 4 ) );
if( ImGui::BeginPopupContextItem() )
{
if( ImGui::MenuItem( "Copy Encoded Node Tree" ) )
{
ImGui::SetClipboardText( node.second.serialised.c_str() );
Debug{} << node.second.serialised.c_str();
}

ImGui::Separator();
ImGui::MenuItem( "Convert To:", nullptr, nullptr, false );

auto& nodeMetadata = node.second.data->metadata;
auto newMetadata = mContextMetadata.front()->DrawUI( [nodeMetadata]( const FastNoise::Metadata* metadata )
{
Expand Down Expand Up @@ -726,9 +782,9 @@ void FastNoiseNodeEditor::DoHelp()
if( ImGui::IsItemHovered() )
{
ImGui::PushStyleVar( ImGuiStyleVar_WindowPadding, ImVec2( 4.f, 4.f ) );
ImGui::BeginTooltip();
constexpr float alignPx = 110;

ImGui::BeginTooltip();
ImGui::Text( "Add nodes" );
ImGui::SameLine( alignPx );
ImGui::Text( "Right mouse click" );
Expand All @@ -740,8 +796,12 @@ void FastNoiseNodeEditor::DoHelp()
ImGui::Text( "Delete node/link" );
ImGui::SameLine( alignPx );
ImGui::Text( "Backspace or Delete" );
ImGui::EndTooltip();

ImGui::Text( "Node options" );
ImGui::SameLine( alignPx );
ImGui::Text( "Right click node" );

ImGui::EndTooltip();
ImGui::PopStyleVar();
}
}
Expand All @@ -754,7 +814,7 @@ void FastNoiseNodeEditor::DoContextMenu()
bool openImportModal = false;

ImGui::PushStyleVar( ImGuiStyleVar_WindowPadding, ImVec2( 4, 4 ) );
if( distance < 5.0f && ImGui::BeginPopupContextWindow( "new_node", 1, false ) )
if( distance < 5.0f && ImGui::BeginPopupContextWindow( "new_node", 1 ) )
{
mContextStartPos = ImGui::GetMousePosOnOpeningCurrentPopup();

Expand Down Expand Up @@ -867,6 +927,31 @@ FastNoise::SmartNode<> FastNoiseNodeEditor::GenerateSelectedPreview()
return generator;
}

FastNoise::OutputMinMax FastNoiseNodeEditor::GenerateNodePreviewNoise( FastNoise::Generator* gen, float* noise )
{
switch( mNodeGenType )
{
case NoiseTexture::GenType_2D:
return gen->GenUniformGrid2D( noise,
Node::NoiseSize / -2, Node::NoiseSize / -2,
Node::NoiseSize, Node::NoiseSize,
mNodeFrequency, mNodeSeed );

case NoiseTexture::GenType_2DTiled:
return gen->GenTileable2D( noise,
Node::NoiseSize, Node::NoiseSize,
mNodeFrequency, mNodeSeed );

case NoiseTexture::GenType_3D:
return gen->GenUniformGrid3D( noise,
Node::NoiseSize / -2, Node::NoiseSize / -2, 0,
Node::NoiseSize, Node::NoiseSize, 1,
mNodeFrequency, mNodeSeed );
}

return {};
}

void FastNoiseNodeEditor::ChangeSelectedNode( int newId )
{
mSelectedNode = newId;
Expand Down
9 changes: 8 additions & 1 deletion NoiseTool/FastNoiseNodeEditor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ namespace Magnum
Node( FastNoiseNodeEditor&, std::unique_ptr<FastNoise::NodeData>&& nodeData );
void GeneratePreview( bool nodeTreeChanged = true );
std::vector<int> GetNodeIDLinks();
uint64_t GetLocalGenerateNs();
void SetNodeLink( int attributeId, FastNoise::NodeData* nodeData );
void AutoPositionChildNodes( ImVec2 nodePos, float verticalSpacing = 380.0f );

Expand Down Expand Up @@ -65,6 +66,7 @@ namespace Magnum
FastNoiseNodeEditor& editor;
std::unique_ptr<FastNoise::NodeData> data;
std::string serialised;
int64_t totalGenerateNs = 0;

static const int NoiseSize = 224;
GL::Texture2D noiseTexture;
Expand Down Expand Up @@ -104,6 +106,8 @@ namespace Magnum
Node& AddNode( ImVec2 startPos, const FastNoise::Metadata* metadata );
bool AddNodeFromEncodedString( const char* string, ImVec2 nodePos );
FastNoise::SmartNode<> GenerateSelectedPreview();
FastNoise::OutputMinMax GenerateNodePreviewNoise( FastNoise::Generator* gen, float* noise );
void BenchmarkOverhead();
void ChangeSelectedNode( int newId );
void CheckLinks();
void DoHelp();
Expand All @@ -124,10 +128,13 @@ namespace Magnum
NoiseTexture mNoiseTexture;

int mSelectedNode = 0;
int64_t mConstantOverhead = 0;

float mNodeFrequency = 0.02f;
int mNodeSeed = 1337;
NoiseTexture::GenType mNodeGenType = NoiseTexture::GenType_2D;

FastSIMD::eLevel mMaxSIMDLevel = FastSIMD::Level_Null;
FastSIMD::eLevel mMaxSIMDLevel = FastSIMD::Level_Null;
FastSIMD::eLevel mActualSIMDLevel = FastSIMD::Level_Null;
};
}
12 changes: 6 additions & 6 deletions NoiseTool/NoiseTexture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ NoiseTexture::NoiseTexture()
mBuildData.seed = 1337;
mBuildData.size = { -1, -1 };
mBuildData.offset = { 0, 0, 0 };
mBuildData.generationType = BuildData::GenType_2D;
mBuildData.generationType = GenType_2D;

for( size_t i = 0; i < 2; i++ )
{
Expand Down Expand Up @@ -65,8 +65,8 @@ void NoiseTexture::Draw()
edited |= ImGui::DragFloat( "Frequency", &mBuildData.frequency, 0.001f );
ImGui::SameLine();

edited |= ImGui::Combo( "Generation Type", reinterpret_cast<int*>( &mBuildData.generationType ), "2D\0" "2D Tiled\0" "3D Slice\0" );
edited |= ImGuiExtra::ScrollCombo( reinterpret_cast<int*>( &mBuildData.generationType ), 3 );
edited |= ImGui::Combo( "Generation Type", reinterpret_cast<int*>( &mBuildData.generationType ), GenTypeStrings );
edited |= ImGuiExtra::ScrollCombo( reinterpret_cast<int*>( &mBuildData.generationType ), GenType_Count );

ImVec2 contentSize = ImGui::GetContentRegionAvail();

Expand Down Expand Up @@ -145,20 +145,20 @@ NoiseTexture::TextureData NoiseTexture::BuildTexture( const BuildData& buildData

switch( buildData.generationType )
{
case BuildData::GenType_2D:
case GenType_2D:
minMax = genRGB->GenUniformGrid2D( noiseData.data(),
buildData.size.x() / -2, buildData.size.y() / -2,
buildData.size.x(), buildData.size.y(),
buildData.frequency, buildData.seed );
break;

case BuildData::GenType_2DTiled:
case GenType_2DTiled:
minMax = genRGB->GenTileable2D( noiseData.data(),
buildData.size.x(), buildData.size.y(),
buildData.frequency, buildData.seed );
break;

case BuildData::GenType_3D:
case GenType_3D:
minMax = genRGB->GenUniformGrid3D( noiseData.data(),
buildData.size.x() / -2, buildData.size.y() / -2, 0,
buildData.size.x(), buildData.size.y(), 1,
Expand Down
Loading

0 comments on commit cfce4d8

Please sign in to comment.