diff options
| author | Konstantin <const@const.me> | 2023-01-18 21:30:46 +0100 |
|---|---|---|
| committer | Konstantin <const@const.me> | 2023-01-18 21:30:46 +0100 |
| commit | e953396d59283b061cfdf4574b164755886f520e (patch) | |
| tree | 9e6f5db97d0b1c5a4c1ab4818d93215d2e0ba889 | |
| parent | 670f889b7e3af360fbd66ae34bc74e7e393edbfe (diff) | |
Minor, logging and UX
| -rw-r--r-- | Examples/WhisperDesktop/ModelAdvancedDlg.cpp | 8 | ||||
| -rw-r--r-- | Whisper/D3D/device.cpp | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/Examples/WhisperDesktop/ModelAdvancedDlg.cpp b/Examples/WhisperDesktop/ModelAdvancedDlg.cpp index c72a838..6df1fa0 100644 --- a/Examples/WhisperDesktop/ModelAdvancedDlg.cpp +++ b/Examples/WhisperDesktop/ModelAdvancedDlg.cpp @@ -10,8 +10,8 @@ LRESULT ModelAdvancedDlg::onInitDialog( UINT nMessage, WPARAM wParam, LPARAM lPa // Setup the "Compute shaders" combobox cbWave.AddString( L"Wave64 shaders on AMD" ); - cbWave.AddString( L"Always use Wave32" ); - cbWave.AddString( L"Always use Wave64" ); + cbWave.AddString( L"Wave32, always" ); + cbWave.AddString( L"Wave64, always" ); int i = 0; if( 0 != ( flags & (uint32_t)eGpuModelFlags::Wave32 ) ) i = 1; @@ -19,10 +19,10 @@ LRESULT ModelAdvancedDlg::onInitDialog( UINT nMessage, WPARAM wParam, LPARAM lPa i = 2; cbWave.SetCurSel( i ); - // Setup the "reshaped multiply" combobox + // Setup the "Reshaped multiply" combobox cbReshapedMatMul.AddString( L"Reshape on AMD" ); cbReshapedMatMul.AddString( L"Don’t reshape tensors" ); - cbReshapedMatMul.AddString( L"Reshape tensors" ); + cbReshapedMatMul.AddString( L"Reshape some tensors" ); i = 0; if( 0 != ( flags & (uint32_t)eGpuModelFlags::NoReshapedMatMul ) ) i = 1; diff --git a/Whisper/D3D/device.cpp b/Whisper/D3D/device.cpp index 5b0a6e8..c135632 100644 --- a/Whisper/D3D/device.cpp +++ b/Whisper/D3D/device.cpp @@ -106,6 +106,18 @@ namespace DirectCompute ef |= (uint8_t)eGpuEffectiveFlags::ReshapedMatMul; s_gpuInfo.flags = (eGpuEffectiveFlags)ef; + + if( willLogMessage( Whisper::eLogLevel::Debug ) ) + { + const int fl = g_featureLevel; + const int flMajor = ( fl >> 12 ) & 0xF; + const int flMinor = ( fl >> 8 ) & 0xF; + + logDebug16( L"Using GPU \"%s\", feature level %i.%i, effective flags %S | %S", + s_gpuInfo.description.c_str(), flMajor, flMinor, + s_gpuInfo.wave64() ? "Wave64" : "Wave32", + s_gpuInfo.useReshapedMatMul() ? "UseReshapedMatMul" : "NoReshapedMatMul" ); + } return S_OK; } |