From 0a732a3b27cdb80bc51122d527f47c4dbc044672 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Thu, 24 Jun 2021 14:51:53 +0200 Subject: [PATCH] tests: Add DXIL path to test_atomic_instructions. It exercises root descriptor atomics, so it's useful. Signed-off-by: Hans-Kristian Arntzen --- tests/d3d12.c | 258 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 208 insertions(+), 50 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 36055aa9..a00f9069 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23225,7 +23225,7 @@ static void test_decrement_uav_counter(void) destroy_test_context(&context); } -static void test_atomic_instructions(void) +static void test_atomic_instructions(bool use_dxil) { ID3D12Resource *ps_buffer, *cs_buffer, *cs_buffer2; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; @@ -23240,27 +23240,27 @@ static void test_atomic_instructions(void) unsigned int i, j; HRESULT hr; - static const DWORD ps_atomics_code[] = - { #if 0 - RWByteAddressBuffer u; + RWByteAddressBuffer u : register(u0); - uint4 v; - int4 i; + uint4 v; + int4 i; - void main() - { - u.InterlockedAnd(0 * 4, v.x); - u.InterlockedCompareStore(1 * 4, v.y, v.x); - u.InterlockedAdd(2 * 4, v.x); - u.InterlockedOr(3 * 4, v.x); - u.InterlockedMax(4 * 4, i.x); - u.InterlockedMin(5 * 4, i.x); - u.InterlockedMax(6 * 4, v.x); - u.InterlockedMin(7 * 4, v.x); - u.InterlockedXor(8 * 4, v.x); - } + void main() + { + u.InterlockedAnd(0 * 4, v.x); + u.InterlockedCompareStore(1 * 4, v.y, v.x); + u.InterlockedAdd(2 * 4, v.x); + u.InterlockedOr(3 * 4, v.x); + u.InterlockedMax(4 * 4, i.x); + u.InterlockedMin(5 * 4, i.x); + u.InterlockedMax(6 * 4, v.x); + u.InterlockedMin(7 * 4, v.x); + u.InterlockedXor(8 * 4, v.x); + } #endif + static const DWORD ps_atomics_code_dxbc[] = + { 0x43425844, 0x24c6a30c, 0x2ce4437d, 0xdee8a0df, 0xd18cb4bc, 0x00000001, 0x000001ac, 0x00000003, 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000158, 0x00000050, 0x00000056, 0x0100086a, @@ -23276,40 +23276,105 @@ static void test_atomic_instructions(void) 0x00000000, 0x00000000, 0x080000ab, 0x0011e000, 0x00000000, 0x00004001, 0x00000020, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_atomics = {ps_atomics_code, sizeof(ps_atomics_code)}; - static const DWORD cs_atomics_code[] = + static const BYTE ps_atomics_code_dxil[] = { + 0x44, 0x58, 0x42, 0x43, 0xbc, 0xa8, 0x5c, 0x88, 0x92, 0x33, 0x83, 0xba, 0xc1, 0xf6, 0x80, 0x1a, 0x12, 0xd6, 0xab, 0x07, 0x01, 0x00, 0x00, 0x00, 0x24, 0x07, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x53, 0x46, 0x49, 0x30, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x53, 0x47, 0x31, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x4f, 0x53, 0x47, 0x31, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x50, 0x53, 0x56, 0x30, 0x5c, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4c, 0x54, 0x06, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x95, 0x01, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4c, 0x00, 0x01, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x3c, 0x06, 0x00, 0x00, 0x42, 0x43, 0xc0, 0xde, 0x21, 0x0c, 0x00, 0x00, 0x8c, 0x01, 0x00, 0x00, 0x0b, 0x82, 0x20, 0x00, 0x02, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x07, 0x81, 0x23, 0x91, 0x41, 0xc8, 0x04, 0x49, 0x06, 0x10, 0x32, 0x39, 0x92, 0x01, 0x84, 0x0c, 0x25, 0x05, 0x08, 0x19, 0x1e, 0x04, 0x8b, 0x62, 0x80, 0x14, 0x45, 0x02, 0x42, 0x92, 0x0b, 0x42, + 0xa4, 0x10, 0x32, 0x14, 0x38, 0x08, 0x18, 0x4b, 0x0a, 0x32, 0x52, 0x88, 0x48, 0x90, 0x14, 0x20, 0x43, 0x46, 0x88, 0xa5, 0x00, 0x19, 0x32, 0x42, 0xe4, 0x48, 0x0e, 0x90, 0x91, 0x22, 0xc4, 0x50, + 0x41, 0x51, 0x81, 0x8c, 0xe1, 0x83, 0xe5, 0x8a, 0x04, 0x29, 0x46, 0x06, 0x51, 0x18, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x1b, 0x8c, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x07, 0x40, 0x02, 0xaa, 0x0d, + 0x84, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x03, 0x20, 0x01, 0x00, 0x00, 0x00, 0x49, 0x18, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x13, 0x82, 0x60, 0x42, 0x20, 0x00, 0x00, 0x00, 0x89, 0x20, 0x00, 0x00, + 0x26, 0x00, 0x00, 0x00, 0x32, 0x22, 0x48, 0x09, 0x20, 0x64, 0x85, 0x04, 0x93, 0x22, 0xa4, 0x84, 0x04, 0x93, 0x22, 0xe3, 0x84, 0xa1, 0x90, 0x14, 0x12, 0x4c, 0x8a, 0x8c, 0x0b, 0x84, 0xa4, 0x4c, + 0x10, 0x58, 0x23, 0x00, 0x25, 0x00, 0x14, 0xe6, 0x08, 0xc0, 0xe0, 0xa8, 0xe1, 0xf2, 0x27, 0xec, 0x21, 0x24, 0x9f, 0xdb, 0xa8, 0x62, 0x25, 0x26, 0x1f, 0xb9, 0x6d, 0x44, 0x8c, 0x31, 0xc6, 0x1c, + 0x01, 0x42, 0xe5, 0x9e, 0xe1, 0xf2, 0x27, 0xec, 0x21, 0x24, 0x3f, 0x04, 0x9a, 0x61, 0x21, 0x50, 0x60, 0x0a, 0x41, 0xc6, 0x19, 0x84, 0x0a, 0x32, 0xc6, 0x19, 0x63, 0x8c, 0x41, 0x6a, 0x8e, 0x20, + 0x28, 0xc6, 0x19, 0x65, 0x0c, 0x46, 0x6d, 0x20, 0xe0, 0x34, 0x69, 0x8a, 0x28, 0x61, 0xf2, 0x57, 0x78, 0xc3, 0x26, 0x42, 0x1b, 0x86, 0x88, 0x90, 0xa4, 0x8d, 0x2a, 0x0a, 0x22, 0x42, 0xc1, 0x20, + 0x38, 0x8c, 0x40, 0x0c, 0x33, 0x21, 0x64, 0x70, 0x0a, 0xec, 0xf0, 0x0e, 0xe2, 0x10, 0x0e, 0xec, 0x30, 0x0f, 0x48, 0x90, 0x92, 0xe6, 0x1c, 0x01, 0x28, 0x00, 0x00, 0x00, 0x13, 0x14, 0x72, 0xc0, + 0x87, 0x74, 0x60, 0x87, 0x36, 0x68, 0x87, 0x79, 0x68, 0x03, 0x72, 0xc0, 0x87, 0x0d, 0xaf, 0x50, 0x0e, 0x6d, 0xd0, 0x0e, 0x7a, 0x50, 0x0e, 0x6d, 0x00, 0x0f, 0x7a, 0x30, 0x07, 0x72, 0xa0, 0x07, + 0x73, 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x71, 0xa0, 0x07, 0x73, 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x78, 0xa0, 0x07, 0x73, 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x71, 0x60, 0x07, 0x7a, 0x30, 0x07, 0x72, 0xd0, + 0x06, 0xe9, 0x30, 0x07, 0x72, 0xa0, 0x07, 0x73, 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x76, 0x40, 0x07, 0x7a, 0x60, 0x07, 0x74, 0xd0, 0x06, 0xe6, 0x10, 0x07, 0x76, 0xa0, 0x07, 0x73, 0x20, 0x07, 0x6d, + 0x60, 0x0e, 0x73, 0x20, 0x07, 0x7a, 0x30, 0x07, 0x72, 0xd0, 0x06, 0xe6, 0x60, 0x07, 0x74, 0xa0, 0x07, 0x76, 0x40, 0x07, 0x6d, 0xe0, 0x0e, 0x78, 0xa0, 0x07, 0x71, 0x60, 0x07, 0x7a, 0x30, 0x07, + 0x72, 0xa0, 0x07, 0x76, 0x40, 0x07, 0x43, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x3c, 0x08, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0c, 0x79, 0x14, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf2, 0x28, 0x40, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xe4, 0x69, 0x80, 0x00, 0x08, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0b, 0x04, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x32, 0x1e, 0x98, 0x10, 0x19, 0x11, 0x4c, 0x90, 0x8c, 0x09, 0x26, 0x47, 0xc6, 0x04, 0x43, 0x1a, + 0x25, 0x30, 0x02, 0x50, 0x08, 0xc5, 0x50, 0x16, 0x05, 0x44, 0x6c, 0x04, 0x80, 0x6a, 0x81, 0x10, 0x9d, 0x01, 0xa0, 0x38, 0x03, 0x00, 0x00, 0x00, 0x79, 0x18, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, + 0x1a, 0x03, 0x4c, 0x90, 0x46, 0x02, 0x13, 0xc4, 0x88, 0x0c, 0x6f, 0xec, 0xed, 0x4d, 0x0c, 0x44, 0x06, 0x26, 0x26, 0xc7, 0x05, 0xa6, 0xc6, 0x05, 0x06, 0x66, 0x43, 0x10, 0x4c, 0x10, 0x86, 0x62, + 0x82, 0x30, 0x18, 0x1b, 0x84, 0x81, 0x98, 0x20, 0x0c, 0xc7, 0x06, 0x61, 0x30, 0x28, 0xc0, 0xcd, 0x4d, 0x10, 0x06, 0x64, 0xc3, 0x80, 0x24, 0xc4, 0x04, 0x21, 0x72, 0x08, 0x4c, 0x10, 0x86, 0x64, + 0x82, 0xc0, 0x2c, 0x1b, 0x16, 0x62, 0x61, 0x08, 0x62, 0x68, 0x1c, 0xc7, 0x01, 0x36, 0x04, 0xcf, 0x04, 0x81, 0x6a, 0x26, 0x08, 0x83, 0xb2, 0x01, 0x21, 0x22, 0x86, 0x20, 0x06, 0x09, 0xd8, 0x10, + 0x4c, 0x1b, 0x08, 0x00, 0xa2, 0x80, 0x09, 0x82, 0x00, 0x6c, 0x00, 0x36, 0x0c, 0xc3, 0x75, 0x6d, 0x08, 0xb0, 0x0d, 0xc3, 0x60, 0x65, 0x24, 0xda, 0xc2, 0xd2, 0xdc, 0x26, 0x08, 0x15, 0xb3, 0x41, + 0x20, 0xb8, 0x0d, 0x85, 0xb5, 0x01, 0x55, 0x57, 0x85, 0x8d, 0xcd, 0xae, 0xcd, 0x25, 0x8d, 0xac, 0xcc, 0x8d, 0x6e, 0x4a, 0x10, 0x54, 0x21, 0xc3, 0x73, 0xb1, 0x2b, 0x93, 0x9b, 0x4b, 0x7b, 0x73, + 0x9b, 0x12, 0x10, 0x4d, 0xc8, 0xf0, 0x5c, 0xec, 0xc2, 0xd8, 0xec, 0xca, 0xe4, 0xa6, 0x04, 0x46, 0x1d, 0x32, 0x3c, 0x97, 0x39, 0xb4, 0x30, 0xb2, 0x32, 0xb9, 0xa6, 0x37, 0xb2, 0x32, 0xb6, 0x29, + 0x41, 0x52, 0x86, 0x0c, 0xcf, 0x45, 0xae, 0x6c, 0xee, 0xad, 0x4e, 0x6e, 0xac, 0x6c, 0x6e, 0x4a, 0x40, 0x55, 0x22, 0xc3, 0x73, 0xa1, 0xcb, 0x83, 0x2b, 0x0b, 0x72, 0x73, 0x7b, 0xa3, 0x0b, 0xa3, + 0x4b, 0x7b, 0x73, 0x9b, 0x9b, 0x12, 0x64, 0x75, 0xc8, 0xf0, 0x5c, 0xca, 0xdc, 0xe8, 0xe4, 0xf2, 0xa0, 0xde, 0xd2, 0xdc, 0xe8, 0xe6, 0xa6, 0x04, 0x1d, 0x00, 0x00, 0x00, 0x79, 0x18, 0x00, 0x00, + 0x4c, 0x00, 0x00, 0x00, 0x33, 0x08, 0x80, 0x1c, 0xc4, 0xe1, 0x1c, 0x66, 0x14, 0x01, 0x3d, 0x88, 0x43, 0x38, 0x84, 0xc3, 0x8c, 0x42, 0x80, 0x07, 0x79, 0x78, 0x07, 0x73, 0x98, 0x71, 0x0c, 0xe6, + 0x00, 0x0f, 0xed, 0x10, 0x0e, 0xf4, 0x80, 0x0e, 0x33, 0x0c, 0x42, 0x1e, 0xc2, 0xc1, 0x1d, 0xce, 0xa1, 0x1c, 0x66, 0x30, 0x05, 0x3d, 0x88, 0x43, 0x38, 0x84, 0x83, 0x1b, 0xcc, 0x03, 0x3d, 0xc8, + 0x43, 0x3d, 0x8c, 0x03, 0x3d, 0xcc, 0x78, 0x8c, 0x74, 0x70, 0x07, 0x7b, 0x08, 0x07, 0x79, 0x48, 0x87, 0x70, 0x70, 0x07, 0x7a, 0x70, 0x03, 0x76, 0x78, 0x87, 0x70, 0x20, 0x87, 0x19, 0xcc, 0x11, + 0x0e, 0xec, 0x90, 0x0e, 0xe1, 0x30, 0x0f, 0x6e, 0x30, 0x0f, 0xe3, 0xf0, 0x0e, 0xf0, 0x50, 0x0e, 0x33, 0x10, 0xc4, 0x1d, 0xde, 0x21, 0x1c, 0xd8, 0x21, 0x1d, 0xc2, 0x61, 0x1e, 0x66, 0x30, 0x89, + 0x3b, 0xbc, 0x83, 0x3b, 0xd0, 0x43, 0x39, 0xb4, 0x03, 0x3c, 0xbc, 0x83, 0x3c, 0x84, 0x03, 0x3b, 0xcc, 0xf0, 0x14, 0x76, 0x60, 0x07, 0x7b, 0x68, 0x07, 0x37, 0x68, 0x87, 0x72, 0x68, 0x07, 0x37, + 0x80, 0x87, 0x70, 0x90, 0x87, 0x70, 0x60, 0x07, 0x76, 0x28, 0x07, 0x76, 0xf8, 0x05, 0x76, 0x78, 0x87, 0x77, 0x80, 0x87, 0x5f, 0x08, 0x87, 0x71, 0x18, 0x87, 0x72, 0x98, 0x87, 0x79, 0x98, 0x81, + 0x2c, 0xee, 0xf0, 0x0e, 0xee, 0xe0, 0x0e, 0xf5, 0xc0, 0x0e, 0xec, 0x30, 0x03, 0x62, 0xc8, 0xa1, 0x1c, 0xe4, 0xa1, 0x1c, 0xcc, 0xa1, 0x1c, 0xe4, 0xa1, 0x1c, 0xdc, 0x61, 0x1c, 0xca, 0x21, 0x1c, + 0xc4, 0x81, 0x1d, 0xca, 0x61, 0x06, 0xd6, 0x90, 0x43, 0x39, 0xc8, 0x43, 0x39, 0x98, 0x43, 0x39, 0xc8, 0x43, 0x39, 0xb8, 0xc3, 0x38, 0x94, 0x43, 0x38, 0x88, 0x03, 0x3b, 0x94, 0xc3, 0x2f, 0xbc, + 0x83, 0x3c, 0xfc, 0x82, 0x3b, 0xd4, 0x03, 0x3b, 0xb0, 0xc3, 0x8c, 0xcc, 0x21, 0x07, 0x7c, 0x70, 0x03, 0x74, 0x60, 0x07, 0x37, 0x90, 0x87, 0x72, 0x98, 0x87, 0x77, 0xa8, 0x07, 0x79, 0x18, 0x87, + 0x72, 0x70, 0x83, 0x70, 0xa0, 0x07, 0x7a, 0x90, 0x87, 0x74, 0x10, 0x87, 0x7a, 0xa0, 0x87, 0x72, 0x00, 0x00, 0x00, 0x00, 0x71, 0x20, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, 0x26, 0x50, 0x0d, 0x97, + 0xef, 0x3c, 0x3e, 0x30, 0x39, 0x0c, 0x22, 0x6c, 0x48, 0x83, 0x3e, 0x3e, 0x72, 0xdb, 0x36, 0xf0, 0x0d, 0x97, 0xef, 0x3c, 0x3e, 0x30, 0x39, 0x0c, 0x22, 0x70, 0x0e, 0xf3, 0x00, 0x11, 0xe1, 0x5d, + 0xc2, 0x01, 0x34, 0x06, 0xe1, 0x23, 0xb7, 0x6d, 0x01, 0xdb, 0x70, 0xf9, 0xce, 0xe3, 0x0b, 0x01, 0x55, 0x14, 0x44, 0x54, 0x3a, 0xc0, 0x50, 0x12, 0x06, 0x20, 0x60, 0x3e, 0x72, 0xdb, 0x46, 0x20, + 0x0d, 0x97, 0xef, 0x3c, 0xbe, 0x10, 0x11, 0xc0, 0x44, 0x84, 0x40, 0x33, 0x2c, 0x84, 0x01, 0x10, 0x0c, 0x80, 0x34, 0x00, 0x61, 0x20, 0x00, 0x00, 0x59, 0x00, 0x00, 0x00, 0x13, 0x04, 0x41, 0x2c, + 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x34, 0x66, 0x00, 0xca, 0xae, 0x38, 0x03, 0x4a, 0xae, 0x3c, 0x03, 0x0a, 0xa2, 0x08, 0x0a, 0xa3, 0x14, 0x0a, 0xa4, 0x50, 0xca, 0xa1, 0x60, 0x0a, + 0xa7, 0x0c, 0xa8, 0x94, 0x40, 0x11, 0x00, 0x00, 0x23, 0x06, 0x09, 0x00, 0x82, 0x60, 0xd0, 0x70, 0x8e, 0xa0, 0x69, 0xd5, 0x88, 0x41, 0x02, 0x80, 0x20, 0x18, 0x34, 0xdd, 0x23, 0x6c, 0x9b, 0x35, + 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0x48, 0x18, 0x48, 0x01, 0x37, 0x9a, 0x10, 0x00, 0x23, 0x06, 0x0b, 0x00, 0x82, 0x60, 0xa0, 0x88, 0xc1, 0x44, 0x7c, 0x5e, 0x55, 0x05, 0x23, 0x06, 0x07, 0x00, + 0x82, 0x60, 0x80, 0x90, 0x41, 0x45, 0x7c, 0xa3, 0x09, 0x01, 0x30, 0x9a, 0x20, 0x04, 0x23, 0x06, 0x0b, 0x00, 0x82, 0x60, 0xa0, 0x94, 0x41, 0x85, 0x84, 0x41, 0x96, 0x05, 0xc2, 0x88, 0xc1, 0x01, + 0x80, 0x20, 0x18, 0x20, 0x68, 0x90, 0x21, 0x63, 0x30, 0x9a, 0x10, 0x00, 0x23, 0x06, 0x0b, 0x00, 0x82, 0x60, 0xa0, 0xa4, 0x81, 0xb6, 0x94, 0xc1, 0xc5, 0x71, 0xc1, 0x88, 0xc1, 0x01, 0x80, 0x20, + 0x18, 0x20, 0x6b, 0xc0, 0x2d, 0x66, 0x30, 0x9a, 0x10, 0x00, 0x23, 0x06, 0x0b, 0x00, 0x82, 0x60, 0xa0, 0xb0, 0x41, 0xe7, 0x64, 0xd8, 0xf7, 0x05, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x80, 0xb8, + 0xc1, 0xe7, 0xa8, 0xc1, 0x68, 0x42, 0x00, 0x8c, 0x18, 0x2c, 0x00, 0x08, 0x82, 0x81, 0xf2, 0x06, 0x60, 0x10, 0x69, 0x99, 0x18, 0x88, 0x41, 0x30, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0x48, 0x1c, + 0x88, 0x41, 0xd4, 0x06, 0xa3, 0x09, 0x01, 0x30, 0x62, 0xb0, 0x00, 0x20, 0x08, 0x06, 0x8a, 0x1c, 0x8c, 0x01, 0xd5, 0x06, 0x5b, 0x19, 0x94, 0x41, 0x30, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0x08, + 0x1d, 0x94, 0x01, 0xf5, 0x06, 0xa3, 0x09, 0x01, 0x30, 0x62, 0xb0, 0x00, 0x20, 0x08, 0x06, 0x4a, 0x1d, 0x98, 0xc1, 0xd5, 0x71, 0x68, 0x80, 0x06, 0xc1, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18, 0x20, + 0x77, 0x80, 0x06, 0x97, 0x1c, 0x8c, 0x26, 0x04, 0xc0, 0x88, 0xc1, 0x02, 0x80, 0x20, 0x18, 0x28, 0x78, 0x90, 0x06, 0x9a, 0x1c, 0x78, 0x6b, 0xb0, 0x06, 0xc1, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18, + 0x20, 0x7a, 0xb0, 0x06, 0x5a, 0x1d, 0x8c, 0x26, 0x04, 0xc0, 0x88, 0xc1, 0x02, 0x80, 0x20, 0x18, 0x28, 0x7b, 0xc0, 0x06, 0x1d, 0x18, 0xcc, 0x81, 0x1b, 0xb8, 0x41, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, + }; + const D3D12_SHADER_BYTECODE ps_atomics = { + use_dxil ? (const void*)ps_atomics_code_dxil : (const void*)ps_atomics_code_dxbc, + use_dxil ? sizeof(ps_atomics_code_dxil) : sizeof(ps_atomics_code_dxbc), + }; + #if 0 - RWByteAddressBuffer u; - RWByteAddressBuffer u2; + RWByteAddressBuffer u : register(u0); + RWByteAddressBuffer u2 : register(u1); - uint4 v; - int4 i; + uint4 v; + int4 i; - [numthreads(1, 1, 1)] - void main() - { - uint r; - u.InterlockedAnd(0 * 4, v.x, r); - u2.Store(0 * 4, r); - u.InterlockedCompareExchange(1 * 4, v.y, v.x, r); - u2.Store(1 * 4, r); - u.InterlockedAdd(2 * 4, v.x, r); - u2.Store(2 * 4, r); - u.InterlockedOr(3 * 4, v.x, r); - u2.Store(3 * 4, r); - u.InterlockedMax(4 * 4, i.x, r); - u2.Store(4 * 4, r); - u.InterlockedMin(5 * 4, i.x, r); - u2.Store(5 * 4, r); - u.InterlockedMax(6 * 4, v.x, r); - u2.Store(6 * 4, r); - u.InterlockedMin(7 * 4, v.x, r); - u2.Store(7 * 4, r); - u.InterlockedXor(8 * 4, v.x, r); - u2.Store(8 * 4, r); - } + [numthreads(1, 1, 1)] + void main() + { + uint r; + u.InterlockedAnd(0 * 4, v.x, r); + u2.Store(0 * 4, r); + u.InterlockedCompareExchange(1 * 4, v.y, v.x, r); + u2.Store(1 * 4, r); + u.InterlockedAdd(2 * 4, v.x, r); + u2.Store(2 * 4, r); + u.InterlockedOr(3 * 4, v.x, r); + u2.Store(3 * 4, r); + u.InterlockedMax(4 * 4, i.x, r); + u2.Store(4 * 4, r); + u.InterlockedMin(5 * 4, i.x, r); + u2.Store(5 * 4, r); + u.InterlockedMax(6 * 4, v.x, r); + u2.Store(6 * 4, r); + u.InterlockedMin(7 * 4, v.x, r); + u2.Store(7 * 4, r); + u.InterlockedXor(8 * 4, v.x, r); + u2.Store(8 * 4, r); + } #endif + static const DWORD cs_atomics_code_dxbc[] = + { 0x43425844, 0x859a96e3, 0x1a35e463, 0x1e89ce58, 0x5cfe430a, 0x00000001, 0x0000026c, 0x00000003, 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000218, 0x00050050, 0x00000086, 0x0100086a, @@ -23331,7 +23396,79 @@ static void test_atomic_instructions(void) 0x0020800a, 0x00000000, 0x00000000, 0x070000a6, 0x0011e012, 0x00000001, 0x00004001, 0x00000020, 0x0010000a, 0x00000000, 0x0100003e, }; - static D3D12_SHADER_BYTECODE cs_atomics = {cs_atomics_code, sizeof(cs_atomics_code)}; + static const BYTE cs_atomics_code_dxil[] = + { + 0x44, 0x58, 0x42, 0x43, 0x3d, 0xa0, 0x6f, 0xe2, 0x86, 0x07, 0x1f, 0x4a, 0x74, 0x6b, 0x06, 0x47, 0x42, 0x19, 0x36, 0x48, 0x01, 0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, 0x53, 0x46, 0x49, 0x30, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x53, 0x47, 0x31, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x4f, 0x53, 0x47, 0x31, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x50, 0x53, 0x56, 0x30, 0x6c, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4c, 0x48, 0x07, 0x00, 0x00, + 0x60, 0x00, 0x05, 0x00, 0xd2, 0x01, 0x00, 0x00, 0x44, 0x58, 0x49, 0x4c, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x30, 0x07, 0x00, 0x00, 0x42, 0x43, 0xc0, 0xde, 0x21, 0x0c, 0x00, 0x00, + 0xc9, 0x01, 0x00, 0x00, 0x0b, 0x82, 0x20, 0x00, 0x02, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x07, 0x81, 0x23, 0x91, 0x41, 0xc8, 0x04, 0x49, 0x06, 0x10, 0x32, 0x39, 0x92, 0x01, 0x84, 0x0c, + 0x25, 0x05, 0x08, 0x19, 0x1e, 0x04, 0x8b, 0x62, 0x80, 0x14, 0x45, 0x02, 0x42, 0x92, 0x0b, 0x42, 0xa4, 0x10, 0x32, 0x14, 0x38, 0x08, 0x18, 0x4b, 0x0a, 0x32, 0x52, 0x88, 0x48, 0x90, 0x14, 0x20, + 0x43, 0x46, 0x88, 0xa5, 0x00, 0x19, 0x32, 0x42, 0xe4, 0x48, 0x0e, 0x90, 0x91, 0x22, 0xc4, 0x50, 0x41, 0x51, 0x81, 0x8c, 0xe1, 0x83, 0xe5, 0x8a, 0x04, 0x29, 0x46, 0x06, 0x51, 0x18, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x1b, 0x8c, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x07, 0x40, 0x02, 0xaa, 0x0d, 0x84, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x03, 0x20, 0x01, 0x00, 0x00, 0x00, 0x49, 0x18, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x13, 0x82, 0x60, 0x42, 0x20, 0x00, 0x00, 0x00, 0x89, 0x20, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x32, 0x22, 0x48, 0x09, 0x20, 0x64, 0x85, 0x04, 0x93, 0x22, 0xa4, 0x84, + 0x04, 0x93, 0x22, 0xe3, 0x84, 0xa1, 0x90, 0x14, 0x12, 0x4c, 0x8a, 0x8c, 0x0b, 0x84, 0xa4, 0x4c, 0x10, 0x60, 0x23, 0x00, 0x25, 0x00, 0x14, 0xe6, 0x08, 0xc0, 0xe0, 0xa8, 0xe1, 0xf2, 0x27, 0xec, + 0x21, 0x24, 0x9f, 0xdb, 0xa8, 0x62, 0x25, 0x26, 0x1f, 0xb9, 0x6d, 0x44, 0x8c, 0x31, 0xc6, 0x1c, 0x01, 0x42, 0xe5, 0x9e, 0xe1, 0xf2, 0x27, 0xec, 0x21, 0x24, 0x3f, 0x04, 0x9a, 0x61, 0x21, 0x50, + 0x60, 0x0a, 0x41, 0xc6, 0x19, 0x84, 0x0a, 0x32, 0xc6, 0x19, 0x63, 0x8c, 0x41, 0x6a, 0x8e, 0x20, 0x28, 0xc6, 0x19, 0x65, 0x0c, 0x46, 0xad, 0x28, 0x60, 0x9c, 0x31, 0xc6, 0x18, 0xa3, 0xd0, 0x1b, + 0x08, 0x38, 0x4d, 0x9a, 0x22, 0x4a, 0x98, 0xfc, 0x15, 0xde, 0xb0, 0x89, 0xd0, 0x86, 0x21, 0x22, 0x24, 0x69, 0xa3, 0x8a, 0x82, 0x88, 0x50, 0x30, 0x48, 0x0e, 0x23, 0x10, 0xc3, 0x4c, 0x08, 0x19, + 0x9c, 0x02, 0x3b, 0xbc, 0x83, 0x38, 0x84, 0x03, 0x3b, 0xcc, 0x03, 0x12, 0x28, 0xa5, 0x3a, 0x47, 0x00, 0x0a, 0x00, 0x00, 0x13, 0x14, 0x72, 0xc0, 0x87, 0x74, 0x60, 0x87, 0x36, 0x68, 0x87, 0x79, + 0x68, 0x03, 0x72, 0xc0, 0x87, 0x0d, 0xaf, 0x50, 0x0e, 0x6d, 0xd0, 0x0e, 0x7a, 0x50, 0x0e, 0x6d, 0x00, 0x0f, 0x7a, 0x30, 0x07, 0x72, 0xa0, 0x07, 0x73, 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x71, 0xa0, + 0x07, 0x73, 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x78, 0xa0, 0x07, 0x73, 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x71, 0x60, 0x07, 0x7a, 0x30, 0x07, 0x72, 0xd0, 0x06, 0xe9, 0x30, 0x07, 0x72, 0xa0, 0x07, 0x73, + 0x20, 0x07, 0x6d, 0x90, 0x0e, 0x76, 0x40, 0x07, 0x7a, 0x60, 0x07, 0x74, 0xd0, 0x06, 0xe6, 0x10, 0x07, 0x76, 0xa0, 0x07, 0x73, 0x20, 0x07, 0x6d, 0x60, 0x0e, 0x73, 0x20, 0x07, 0x7a, 0x30, 0x07, + 0x72, 0xd0, 0x06, 0xe6, 0x60, 0x07, 0x74, 0xa0, 0x07, 0x76, 0x40, 0x07, 0x6d, 0xe0, 0x0e, 0x78, 0xa0, 0x07, 0x71, 0x60, 0x07, 0x7a, 0x30, 0x07, 0x72, 0xa0, 0x07, 0x76, 0x40, 0x07, 0x43, 0x9e, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x3c, 0x08, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x79, 0x14, 0x20, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf2, 0x28, 0x40, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xe4, 0x69, 0x80, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, + 0xc8, 0xf3, 0x00, 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x16, 0x08, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x32, 0x1e, 0x98, 0x14, 0x19, 0x11, 0x4c, 0x90, 0x8c, 0x09, 0x26, 0x47, + 0xc6, 0x04, 0x43, 0x1a, 0x25, 0x30, 0x02, 0x50, 0x08, 0xc5, 0x50, 0x16, 0x05, 0x44, 0x6c, 0x04, 0x80, 0x6e, 0x81, 0x90, 0x9d, 0x01, 0xa0, 0x39, 0x03, 0x00, 0x00, 0x00, 0x79, 0x18, 0x00, 0x00, + 0x43, 0x00, 0x00, 0x00, 0x1a, 0x03, 0x4c, 0x90, 0x46, 0x02, 0x13, 0xc4, 0x88, 0x0c, 0x6f, 0xec, 0xed, 0x4d, 0x0c, 0x44, 0x06, 0x26, 0x26, 0xc7, 0x05, 0xa6, 0xc6, 0x05, 0x06, 0x66, 0x43, 0x10, + 0x4c, 0x10, 0x06, 0x63, 0x82, 0x30, 0x1c, 0x1b, 0x84, 0x81, 0x98, 0x20, 0x0c, 0xc8, 0x06, 0x61, 0x30, 0x28, 0x8c, 0xcd, 0x4d, 0x10, 0x86, 0x64, 0xc3, 0x80, 0x24, 0xc4, 0x04, 0x61, 0x7a, 0x08, + 0x4c, 0x10, 0x06, 0x65, 0x82, 0xc0, 0x30, 0x1b, 0x16, 0x62, 0x61, 0x08, 0x62, 0x68, 0x1c, 0xc7, 0x01, 0x36, 0x2c, 0xc3, 0xc2, 0x10, 0xc3, 0xd0, 0x38, 0x8e, 0x03, 0x6c, 0x10, 0x1e, 0x68, 0x82, + 0x60, 0x39, 0x13, 0x84, 0x61, 0xd9, 0x80, 0x10, 0x12, 0x43, 0x10, 0xc3, 0x04, 0x6c, 0x08, 0xa8, 0x0d, 0x04, 0x10, 0x55, 0xc0, 0x04, 0x41, 0x00, 0x36, 0x00, 0x1b, 0x86, 0x01, 0xc3, 0x36, 0x04, + 0xd9, 0x86, 0x61, 0xb8, 0x34, 0x12, 0x6d, 0x61, 0x69, 0x6e, 0x13, 0x84, 0xab, 0xd9, 0x30, 0x0c, 0xc3, 0xb0, 0x81, 0x20, 0x3a, 0xc3, 0xdb, 0x50, 0x5c, 0x1c, 0x60, 0x7d, 0x55, 0xd8, 0xd8, 0xec, + 0xda, 0x5c, 0xd2, 0xc8, 0xca, 0xdc, 0xe8, 0xa6, 0x04, 0x41, 0x15, 0x32, 0x3c, 0x17, 0xbb, 0x32, 0xb9, 0xb9, 0xb4, 0x37, 0xb7, 0x29, 0x01, 0xd1, 0x84, 0x0c, 0xcf, 0xc5, 0x2e, 0x8c, 0xcd, 0xae, + 0x4c, 0x6e, 0x4a, 0x60, 0xd4, 0x21, 0xc3, 0x73, 0x99, 0x43, 0x0b, 0x23, 0x2b, 0x93, 0x6b, 0x7a, 0x23, 0x2b, 0x63, 0x9b, 0x12, 0x24, 0x65, 0xc8, 0xf0, 0x5c, 0xe4, 0xca, 0xe6, 0xde, 0xea, 0xe4, + 0xc6, 0xca, 0xe6, 0xa6, 0x04, 0x55, 0x25, 0x32, 0x3c, 0x17, 0xba, 0x3c, 0xb8, 0xb2, 0x20, 0x37, 0xb7, 0x37, 0xba, 0x30, 0xba, 0xb4, 0x37, 0xb7, 0xb9, 0x29, 0x81, 0x56, 0x87, 0x0c, 0xcf, 0xa5, + 0xcc, 0x8d, 0x4e, 0x2e, 0x0f, 0xea, 0x2d, 0xcd, 0x8d, 0x6e, 0x6e, 0x4a, 0xf0, 0x01, 0x00, 0x00, 0x79, 0x18, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x33, 0x08, 0x80, 0x1c, 0xc4, 0xe1, 0x1c, 0x66, + 0x14, 0x01, 0x3d, 0x88, 0x43, 0x38, 0x84, 0xc3, 0x8c, 0x42, 0x80, 0x07, 0x79, 0x78, 0x07, 0x73, 0x98, 0x71, 0x0c, 0xe6, 0x00, 0x0f, 0xed, 0x10, 0x0e, 0xf4, 0x80, 0x0e, 0x33, 0x0c, 0x42, 0x1e, + 0xc2, 0xc1, 0x1d, 0xce, 0xa1, 0x1c, 0x66, 0x30, 0x05, 0x3d, 0x88, 0x43, 0x38, 0x84, 0x83, 0x1b, 0xcc, 0x03, 0x3d, 0xc8, 0x43, 0x3d, 0x8c, 0x03, 0x3d, 0xcc, 0x78, 0x8c, 0x74, 0x70, 0x07, 0x7b, + 0x08, 0x07, 0x79, 0x48, 0x87, 0x70, 0x70, 0x07, 0x7a, 0x70, 0x03, 0x76, 0x78, 0x87, 0x70, 0x20, 0x87, 0x19, 0xcc, 0x11, 0x0e, 0xec, 0x90, 0x0e, 0xe1, 0x30, 0x0f, 0x6e, 0x30, 0x0f, 0xe3, 0xf0, + 0x0e, 0xf0, 0x50, 0x0e, 0x33, 0x10, 0xc4, 0x1d, 0xde, 0x21, 0x1c, 0xd8, 0x21, 0x1d, 0xc2, 0x61, 0x1e, 0x66, 0x30, 0x89, 0x3b, 0xbc, 0x83, 0x3b, 0xd0, 0x43, 0x39, 0xb4, 0x03, 0x3c, 0xbc, 0x83, + 0x3c, 0x84, 0x03, 0x3b, 0xcc, 0xf0, 0x14, 0x76, 0x60, 0x07, 0x7b, 0x68, 0x07, 0x37, 0x68, 0x87, 0x72, 0x68, 0x07, 0x37, 0x80, 0x87, 0x70, 0x90, 0x87, 0x70, 0x60, 0x07, 0x76, 0x28, 0x07, 0x76, + 0xf8, 0x05, 0x76, 0x78, 0x87, 0x77, 0x80, 0x87, 0x5f, 0x08, 0x87, 0x71, 0x18, 0x87, 0x72, 0x98, 0x87, 0x79, 0x98, 0x81, 0x2c, 0xee, 0xf0, 0x0e, 0xee, 0xe0, 0x0e, 0xf5, 0xc0, 0x0e, 0xec, 0x30, + 0x03, 0x62, 0xc8, 0xa1, 0x1c, 0xe4, 0xa1, 0x1c, 0xcc, 0xa1, 0x1c, 0xe4, 0xa1, 0x1c, 0xdc, 0x61, 0x1c, 0xca, 0x21, 0x1c, 0xc4, 0x81, 0x1d, 0xca, 0x61, 0x06, 0xd6, 0x90, 0x43, 0x39, 0xc8, 0x43, + 0x39, 0x98, 0x43, 0x39, 0xc8, 0x43, 0x39, 0xb8, 0xc3, 0x38, 0x94, 0x43, 0x38, 0x88, 0x03, 0x3b, 0x94, 0xc3, 0x2f, 0xbc, 0x83, 0x3c, 0xfc, 0x82, 0x3b, 0xd4, 0x03, 0x3b, 0xb0, 0xc3, 0x8c, 0xcc, + 0x21, 0x07, 0x7c, 0x70, 0x03, 0x74, 0x60, 0x07, 0x37, 0x90, 0x87, 0x72, 0x98, 0x87, 0x77, 0xa8, 0x07, 0x79, 0x18, 0x87, 0x72, 0x70, 0x83, 0x70, 0xa0, 0x07, 0x7a, 0x90, 0x87, 0x74, 0x10, 0x87, + 0x7a, 0xa0, 0x87, 0x72, 0x00, 0x00, 0x00, 0x00, 0x71, 0x20, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x26, 0x50, 0x0d, 0x97, 0xef, 0x3c, 0x3e, 0x30, 0x39, 0x0c, 0x22, 0x6c, 0x48, 0x83, 0x3e, 0x3e, + 0x72, 0xdb, 0x36, 0xf0, 0x0d, 0x97, 0xef, 0x3c, 0x3e, 0x30, 0x39, 0x0c, 0x22, 0x70, 0x0e, 0xf3, 0x00, 0x11, 0xe1, 0x5d, 0xc2, 0x01, 0x34, 0x06, 0xe1, 0x23, 0xb7, 0x6d, 0x05, 0xd5, 0x70, 0xf9, + 0xce, 0xe3, 0x07, 0x54, 0x51, 0x10, 0x11, 0x3b, 0x39, 0x11, 0xe1, 0x23, 0xb7, 0x6d, 0x01, 0xdb, 0x70, 0xf9, 0xce, 0xe3, 0x0b, 0x01, 0x55, 0x14, 0x44, 0x54, 0x3a, 0xc0, 0x50, 0x12, 0x06, 0x20, + 0x60, 0x3e, 0x72, 0xdb, 0x46, 0x20, 0x0d, 0x97, 0xef, 0x3c, 0xbe, 0x10, 0x11, 0xc0, 0x44, 0x84, 0x40, 0x33, 0x2c, 0x84, 0x01, 0x10, 0x0c, 0x80, 0x34, 0x00, 0x00, 0x00, 0x61, 0x20, 0x00, 0x00, + 0x88, 0x00, 0x00, 0x00, 0x13, 0x04, 0x41, 0x2c, 0x10, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x34, 0x66, 0x00, 0xca, 0xae, 0x14, 0x03, 0x8a, 0x33, 0xa0, 0xe4, 0x0a, 0xa2, 0x30, 0x0a, 0xa4, + 0x50, 0x0a, 0xa6, 0x70, 0xca, 0x33, 0xa0, 0x08, 0x4a, 0xa1, 0x1c, 0xca, 0x80, 0x4a, 0x09, 0x14, 0x01, 0x00, 0x00, 0x00, 0x23, 0x06, 0x09, 0x00, 0x82, 0x60, 0xd0, 0x78, 0x8e, 0xc0, 0x71, 0xd6, + 0x88, 0x41, 0x02, 0x80, 0x20, 0x18, 0x34, 0xdf, 0x33, 0x70, 0xdc, 0x35, 0x62, 0x90, 0x00, 0x20, 0x08, 0x06, 0x0d, 0x18, 0x40, 0x43, 0xd7, 0x61, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x80, 0x90, + 0x01, 0x15, 0x78, 0xa3, 0x09, 0x01, 0x30, 0x62, 0xb0, 0x00, 0x20, 0x08, 0x06, 0x4a, 0x19, 0x50, 0x44, 0x18, 0x80, 0xc1, 0x75, 0x05, 0x23, 0x06, 0x0d, 0x00, 0x82, 0x60, 0xf0, 0x8c, 0x81, 0x65, + 0x84, 0x01, 0x16, 0x60, 0x18, 0x86, 0x8c, 0x18, 0x1c, 0x00, 0x08, 0x82, 0x01, 0x72, 0x06, 0x17, 0x11, 0x06, 0xa3, 0x09, 0x01, 0x30, 0x9a, 0x20, 0x04, 0x23, 0x06, 0x0b, 0x00, 0x82, 0x60, 0xa0, + 0xa0, 0x01, 0x84, 0x8c, 0xc1, 0xb6, 0x05, 0xc2, 0x88, 0x41, 0x03, 0x80, 0x20, 0x18, 0x3c, 0x67, 0xa0, 0x29, 0x64, 0xc0, 0x05, 0x1c, 0xc7, 0x31, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x80, 0xac, + 0xc1, 0x86, 0x94, 0xc1, 0x68, 0x42, 0x00, 0x8c, 0x18, 0x2c, 0x00, 0x08, 0x82, 0x81, 0xc2, 0x06, 0xdb, 0x72, 0x06, 0x99, 0xe7, 0x05, 0x23, 0x06, 0x0d, 0x00, 0x82, 0x60, 0xf0, 0xa8, 0x41, 0xd7, + 0x68, 0x5f, 0xf0, 0x7d, 0xdf, 0x33, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0x88, 0x1b, 0x78, 0x0b, 0x1a, 0x8c, 0x26, 0x04, 0xc0, 0x88, 0xc1, 0x02, 0x80, 0x20, 0x18, 0x28, 0x6f, 0xe0, 0x39, 0xd5, + 0x16, 0x06, 0x61, 0x10, 0x8c, 0x18, 0x34, 0x00, 0x08, 0x82, 0xc1, 0xd3, 0x06, 0x60, 0x00, 0x71, 0x62, 0x10, 0x88, 0x81, 0x18, 0x88, 0x81, 0x34, 0x62, 0x70, 0x00, 0x20, 0x08, 0x06, 0x48, 0x1c, + 0x84, 0x81, 0xc3, 0x06, 0xa3, 0x09, 0x01, 0x30, 0x62, 0xb0, 0x00, 0x20, 0x08, 0x06, 0x8a, 0x1c, 0x84, 0x41, 0x74, 0x75, 0x64, 0x40, 0x06, 0xc1, 0x88, 0x41, 0x03, 0x80, 0x20, 0x18, 0x3c, 0x70, + 0x30, 0x06, 0x93, 0x57, 0x06, 0x41, 0x19, 0x94, 0x41, 0x19, 0x54, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x80, 0xd0, 0x01, 0x19, 0x44, 0x6f, 0x30, 0x9a, 0x10, 0x00, 0x23, 0x06, 0x0b, 0x00, 0x82, + 0x60, 0xa0, 0xd4, 0x01, 0x19, 0x50, 0x6f, 0xf0, 0x9d, 0xc1, 0x19, 0x04, 0x23, 0x06, 0x0d, 0x00, 0x82, 0x60, 0xf0, 0xcc, 0x81, 0x19, 0x58, 0x60, 0x80, 0x06, 0x01, 0x1a, 0xa0, 0x01, 0x1a, 0x60, + 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x80, 0xdc, 0xc1, 0x19, 0x50, 0x71, 0x30, 0x9a, 0x10, 0x00, 0x23, 0x06, 0x0b, 0x00, 0x82, 0x60, 0xa0, 0xe0, 0xc1, 0x19, 0x5c, 0x5c, 0x18, 0xa8, 0x81, 0x1a, + 0x04, 0x23, 0x06, 0x0d, 0x00, 0x82, 0x60, 0xf0, 0xd8, 0x41, 0x1a, 0x64, 0x62, 0xb0, 0x06, 0xc1, 0x1a, 0xac, 0xc1, 0x1a, 0x6c, 0x23, 0x06, 0x07, 0x00, 0x82, 0x60, 0x80, 0xe8, 0x81, 0x1a, 0x5c, + 0x74, 0x30, 0x9a, 0x10, 0x00, 0x23, 0x06, 0x0b, 0x00, 0x82, 0x60, 0xa0, 0xec, 0x81, 0x1a, 0x68, 0x74, 0x30, 0x06, 0x6d, 0xd0, 0x06, 0xc1, 0x88, 0x41, 0x03, 0x80, 0x20, 0x18, 0x3c, 0x79, 0xc0, + 0x06, 0x1c, 0x19, 0xb8, 0x41, 0xe0, 0x06, 0x6e, 0xe0, 0x06, 0xde, 0x88, 0xc1, 0x01, 0x80, 0x20, 0x18, 0x20, 0x7d, 0xd0, 0x06, 0xda, 0x1d, 0x8c, 0x26, 0x04, 0xc0, 0x88, 0xc1, 0x02, 0x80, 0x20, + 0x18, 0x28, 0x7e, 0xd0, 0x06, 0x5d, 0x18, 0xd4, 0x01, 0x1c, 0xc0, 0x41, 0x30, 0x62, 0xd0, 0x00, 0x20, 0x08, 0x06, 0x0f, 0x1f, 0xbc, 0xc1, 0x67, 0x07, 0x71, 0x10, 0xc4, 0x41, 0x1c, 0xc4, 0x41, + 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; + const D3D12_SHADER_BYTECODE cs_atomics = { + use_dxil ? (const void*)cs_atomics_code_dxil : (const void*)cs_atomics_code_dxbc, + use_dxil ? sizeof(cs_atomics_code_dxil) : sizeof(cs_atomics_code_dxbc), + }; static const char * const instructions[] = { "atomic_and", "atomic_cmp_store", "atomic_iadd", "atomic_or", @@ -23362,6 +23499,13 @@ static void test_atomic_instructions(void) desc.no_root_signature = true; if (!init_test_context(&context, &desc)) return; + + if (use_dxil && !context_supports_dxil(&context)) + { + destroy_test_context(&context); + return; + } + device = context.device; command_list = context.list; queue = context.queue; @@ -23394,7 +23538,10 @@ static void test_atomic_instructions(void) cs_buffer2 = create_default_buffer(device, sizeof(tests->input), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps_atomics, NULL); + if (use_dxil) + context.pipeline_state = create_pipeline_state_dxil(context.device, context.root_signature, 0, NULL, &ps_atomics, NULL); + else + context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps_atomics, NULL); pipeline_state = create_compute_pipeline_state(device, context.root_signature, cs_atomics); @@ -23499,6 +23646,16 @@ static void test_atomic_instructions(void) destroy_test_context(&context); } +static void test_atomic_instructions_dxbc(void) +{ + test_atomic_instructions(false); +} + +static void test_atomic_instructions_dxil(void) +{ + test_atomic_instructions(true); +} + static void test_buffer_srv(void) { struct buffer @@ -51605,7 +51762,8 @@ START_TEST(d3d12) run_test(test_cs_uav_store); run_test(test_uav_counters); run_test(test_decrement_uav_counter); - run_test(test_atomic_instructions); + run_test(test_atomic_instructions_dxbc); + run_test(test_atomic_instructions_dxil); run_test(test_buffer_srv); run_test(test_create_query_heap); run_test(test_query_timestamp);