SWDEV-260376 - [PAL] Fix Windows build

Change-Id: I788198b5980a46981de4b2e7aaa6a495e6e98cad


[ROCm/clr commit: 2ee2392f63]
Αυτή η υποβολή περιλαμβάνεται σε:
Jason Tang
2020-11-12 10:35:26 -05:00
υποβλήθηκε από Jason Tang
γονέας 3896293999
υποβολή f4c4323f8e
3 αρχεία άλλαξαν με 6 προσθήκες και 6 διαγραφές
@@ -141,7 +141,7 @@ struct AMDDeviceInfo {
uint gfxipVersionLC_; //!< The core engine GFXIP version for LC
uint gfxipVersion_; //!< The core engine GFXIP version
bool xnackEnabled_; //!< Enable XNACK feature
Pal::AsicRevision asicRevision_; //!< PAL GpuId
Pal::AsicRevision asicRevision_; //!< PAL AsicRevision
};
static constexpr AMDDeviceInfo UnknownDevice = {"", "", 16, 256, 32, 0, 0, false};
@@ -295,7 +295,7 @@ bool NullDevice::init() {
bool NullDevice::create(Pal::AsicRevision asicRevision, Pal::GfxIpLevel ipLevel,
uint xNACKSupported) {
bool xNACKSupported) {
if (amd::IS_HIP && IS_MAINLINE &&
(asicRevision != Pal::AsicRevision::Vega20)) {
return false;
@@ -931,7 +931,7 @@ bool Device::create(Pal::IDevice* device) {
// XNACK flag should be set for PageMigration | IOMMUv2 Support
// Note: Navi2x should have a fix in HW
uint isXNACKSupported = (ipLevel_ <= Pal::GfxIpLevel::GfxIp10_1) &&
bool isXNACKSupported = (ipLevel_ <= Pal::GfxIpLevel::GfxIp10_1) &&
(static_cast<uint>(properties_.gpuMemoryProperties.flags.pageMigrationEnabled ||
properties_.gpuMemoryProperties.flags.iommuv2Support));
@@ -66,7 +66,7 @@ class NullDevice : public amd::Device {
//! Creates an offline device with the specified target
bool create(Pal::AsicRevision asicRevision, //!< GPU ASIC revision
Pal::GfxIpLevel ipLevel, //!< GPU ip level
uint xNACKSupported = 0 //!< GPU xNACKSupported
bool xNACKSupported = false //!< GPU xNACKSupported
);
//! Instantiate a new virtual device
@@ -431,9 +431,9 @@ class Device : public NullDevice {
}
//! Returns the number of available compute rings
uint numExclusiveComputeEngines() const {
uint numExclusiveComputeEngines() const {
return exclusiveComputeEnginesId_.size() +
((exclusiveComputeEnginesId().find(ExclusiveQueueType::RealTime1) ==
((exclusiveComputeEnginesId().find(ExclusiveQueueType::RealTime1) ==
exclusiveComputeEnginesId().end()) ? 1 : 0); }
//! Returns the map of available exclusive compute rings with the engine index