Skip to content

Move adapter output dump to test harness. #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2022
Merged

Move adapter output dump to test harness. #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions src/gpgmm/d3d12/CapsD3D12.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,27 +102,6 @@ namespace gpgmm::d3d12 {
caps->mIsResourceAllocationWithinCoherent = true;
}

// Dump log for debugging purposes.
DebugLog() << "GPU: " << WCharToUTF8(adapterDesc.Description)
<< " (device: " << ToHexStr(adapterDesc.DeviceId)
<< ", vendor: " << ToHexStr(adapterDesc.VendorId) << ")";
DebugLog() << "System memory: "
<< GPGMM_BYTES_TO_GB(adapterDesc.SharedSystemMemory +
adapterDesc.DedicatedSystemMemory)
<< " GBs"
<< " (" << GPGMM_BYTES_TO_GB(adapterDesc.DedicatedSystemMemory)
<< " dedicated) ";

DebugLog() << "Unified memory architecture: " << ((arch.UMA) ? "yes" : "no")
<< ((arch.CacheCoherentUMA) ? " (cache-coherent)" : "");
DebugLog() << "Max resource size: " << GPGMM_BYTES_TO_MB(caps->GetMaxResourceSize())
<< " MBs";
DebugLog() << "Max resource heap tier: " << caps->GetMaxResourceHeapTierSupported();
DebugLog() << "Max resource heap size: "
<< GPGMM_BYTES_TO_GB(caps->GetMaxResourceHeapSize()) << " GBs";
DebugLog() << "Creation of non-resident heaps: "
<< ((caps->IsCreateHeapNotResidentSupported()) ? "Supported" : "Not supported");

*capsOut = caps.release();
return S_OK;
}
Expand Down
35 changes: 35 additions & 0 deletions src/tests/D3D12Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

#include <gpgmm_d3d12.h>

#include "gpgmm/common/SizeClass.h"
#include "gpgmm/d3d12/CapsD3D12.h"
#include "gpgmm/utils/WindowsUtils.h"

namespace gpgmm::d3d12 {

D3D12_MESSAGE_SEVERITY GetMessageSeverity(LogSeverity logSeverity) {
Expand Down Expand Up @@ -66,6 +70,37 @@ namespace gpgmm::d3d12 {
ASSERT_SUCCEEDED(
mDevice->CheckFeatureSupport(D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)));
mResourceHeapTier = options.ResourceHeapTier;

DXGI_ADAPTER_DESC adapterDesc;
ASSERT_SUCCEEDED(mAdapter->GetDesc(&adapterDesc));

DebugLog() << "GPU: " << WCharToUTF8(adapterDesc.Description)
<< " (device: " << ToHexStr(adapterDesc.DeviceId)
<< ", vendor: " << ToHexStr(adapterDesc.VendorId) << ")";
DebugLog() << "System memory: "
<< GPGMM_BYTES_TO_GB(adapterDesc.SharedSystemMemory +
adapterDesc.DedicatedSystemMemory)
<< " GBs"
<< " (" << GPGMM_BYTES_TO_GB(adapterDesc.DedicatedSystemMemory)
<< " dedicated) ";

DebugLog() << "Unified memory: " << ((arch.UMA) ? "yes" : "no")
<< ((arch.CacheCoherentUMA) ? " (cache-coherent)" : "");

std::unique_ptr<Caps> caps;
{
Caps* capsPtr = nullptr;
ASSERT_SUCCEEDED(Caps::CreateCaps(mDevice.Get(), mAdapter.Get(), &capsPtr));
caps.reset(capsPtr);
}

DebugLog() << "Max resource size: " << GPGMM_BYTES_TO_MB(caps->GetMaxResourceSize())
<< " MBs";
DebugLog() << "Max resource heap tier: " << caps->GetMaxResourceHeapTierSupported();
DebugLog() << "Max resource heap size: "
<< GPGMM_BYTES_TO_GB(caps->GetMaxResourceHeapSize()) << " GBs";
DebugLog() << "Creation of non-resident heaps: "
<< ((caps->IsCreateHeapNotResidentSupported()) ? "Supported" : "Not supported");
}

void D3D12TestBase::TearDown() {
Expand Down