fix bug causing fine-grain SVM to not be reported by device queries

bashbaug · bashbaug · commit 81912d0c980e · 2025-01-03T14:40:19.000-08:00
diff --git a/layers/99_svmplusplus/emulate.cpp b/layers/99_svmplusplus/emulate.cpp
@@ -313,12 +313,12 @@ struct SLayerContext
                 else if ((caps & CL_SVM_TYPE_MACRO_SINGLE_DEVICE_SHARED_KHR) == CL_SVM_TYPE_MACRO_SINGLE_DEVICE_SHARED_KHR) {
                     typeCapsDevice.push_back(getSingleDeviceSharedUSMCaps(device));
                 }
-                else if ((caps & CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) == CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) {
-                    typeCapsDevice.push_back(getCoarseGrainSVMCaps(device));
-                }
                 else if ((caps & CL_SVM_TYPE_MACRO_FINE_GRAIN_BUFFER_KHR) == CL_SVM_TYPE_MACRO_FINE_GRAIN_BUFFER_KHR) {
                     typeCapsDevice.push_back(getFineGrainSVMCaps(device));
                 }
+                else if ((caps & CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) == CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) {
+                    typeCapsDevice.push_back(getCoarseGrainSVMCaps(device));
+                }
                 else if ((caps & CL_SVM_TYPE_MACRO_SYSTEM_KHR) == CL_SVM_TYPE_MACRO_SYSTEM_KHR) {
                     typeCapsDevice.push_back(getSystemSVMCaps(device));
                 }

Original file line number	Diff line number	Diff line change
`@@ -313,12 +313,12 @@ struct SLayerContext`
`313`	`313`	`else if ((caps & CL_SVM_TYPE_MACRO_SINGLE_DEVICE_SHARED_KHR) == CL_SVM_TYPE_MACRO_SINGLE_DEVICE_SHARED_KHR) {`
`314`	`314`	`typeCapsDevice.push_back(getSingleDeviceSharedUSMCaps(device));`
`315`	`315`	`}`
`316`		`- else if ((caps & CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) == CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) {`
`317`		`- typeCapsDevice.push_back(getCoarseGrainSVMCaps(device));`
`318`		`- }`
`319`	`316`	`else if ((caps & CL_SVM_TYPE_MACRO_FINE_GRAIN_BUFFER_KHR) == CL_SVM_TYPE_MACRO_FINE_GRAIN_BUFFER_KHR) {`
`320`	`317`	`typeCapsDevice.push_back(getFineGrainSVMCaps(device));`
`321`	`318`	`}`
	`319`	`+ else if ((caps & CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) == CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR) {`
	`320`	`+ typeCapsDevice.push_back(getCoarseGrainSVMCaps(device));`
	`321`	`+ }`
`322`	`322`	`else if ((caps & CL_SVM_TYPE_MACRO_SYSTEM_KHR) == CL_SVM_TYPE_MACRO_SYSTEM_KHR) {`
`323`	`323`	`typeCapsDevice.push_back(getSystemSVMCaps(device));`
`324`	`324`	`}`