AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use fixed size type for queue type arguments.

Browse Source 
Change-Id: I81b605c9cc9b18bcef043a4f0292212241ce5987


[ROCm/ROCR-Runtime commit: bc43f97964]
This commit is contained in:
Sean Keely
2017-02-04 12:15:08 -06:00
parent 835866b042
commit d984194fa5
11 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocr-runtime/runtime/hsa-runtime/core/common/hsa_table_interface.cpp
+2 -2
View File
@@ -142,7 +142,7 @@ hsa_status_t HSA_API hsa_agent_major_extension_supported(uint16_t extension, hsa
}
hsa_status_t HSA_API
hsa_queue_create(hsa_agent_t agent, uint32_t size, hsa_queue_type_t type,
hsa_queue_create(hsa_agent_t agent, uint32_t size, hsa_queue_type32_t type,
void (*callback)(hsa_status_t status, hsa_queue_t* source,
void* data),
void* data, uint32_t private_segment_size,
@@ -154,7 +154,7 @@ hsa_status_t HSA_API
hsa_status_t HSA_API
hsa_soft_queue_create(hsa_region_t region, uint32_t size,
hsa_queue_type_t type, uint32_t features,
hsa_queue_type32_t type, uint32_t features,
hsa_signal_t completion_signal, hsa_queue_t** queue) {
return coreApiTable->hsa_soft_queue_create_fn(region, size, type, features,
completion_signal, queue);
projects/rocr-runtime/runtime/hsa-runtime/core/inc/agent.h
+1 -1
View File
@@ -212,7 +212,7 @@ class Agent : public Checked<0xF6BC25EB17E6F917> {
// to the newly created queue.
//
// @retval HSA_STATUS_SUCCESS The queue has been created successfully.
virtual hsa_status_t QueueCreate(size_t size, hsa_queue_type_t queue_type,
virtual hsa_status_t QueueCreate(size_t size, hsa_queue_type32_t queue_type,
HsaEventCallback event_callback, void* data,
uint32_t private_segment_size,
uint32_t group_segment_size,
projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_cpu_agent.h
+1 -1
View File
@@ -97,7 +97,7 @@ class CpuAgent : public core::Agent {
hsa_status_t GetInfo(hsa_agent_info_t attribute, void* value) const override;
// @brief Override from core::Agent.
hsa_status_t QueueCreate(size_t size, hsa_queue_type_t queue_type,
hsa_status_t QueueCreate(size_t size, hsa_queue_type32_t queue_type,
core::HsaEventCallback event_callback, void* data,
uint32_t private_segment_size,
uint32_t group_segment_size,
projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_agent.h
+1 -1
View File
@@ -246,7 +246,7 @@ class GpuAgent : public GpuAgentInt {
hsa_status_t GetInfo(hsa_agent_info_t attribute, void* value) const override;
// @brief Override from core::Agent.
hsa_status_t QueueCreate(size_t size, hsa_queue_type_t queue_type,
hsa_status_t QueueCreate(size_t size, hsa_queue_type32_t queue_type,
core::HsaEventCallback event_callback, void* data,
uint32_t private_segment_size,
uint32_t group_segment_size,
projects/rocr-runtime/runtime/hsa-runtime/core/inc/host_queue.h
+1 -1
View File
@@ -51,7 +51,7 @@
namespace core {
class HostQueue : public Queue {
public:
HostQueue(hsa_region_t region, uint32_t ring_size, hsa_queue_type_t type,
HostQueue(hsa_region_t region, uint32_t ring_size, hsa_queue_type32_t type,
uint32_t features, hsa_signal_t doorbell_signal);
~HostQueue();
projects/rocr-runtime/runtime/hsa-runtime/core/inc/hsa_internal.h
+2 -2
View File
@@ -86,14 +86,14 @@ namespace HSA
uint16_t version_major,
uint16_t* version_minor, bool* result);
hsa_status_t HSA_API
hsa_queue_create(hsa_agent_t agent, uint32_t size, hsa_queue_type_t type,
hsa_queue_create(hsa_agent_t agent, uint32_t size, hsa_queue_type32_t type,
void (*callback)(hsa_status_t status, hsa_queue_t *source,
void *data),
void *data, uint32_t private_segment_size,
uint32_t group_segment_size, hsa_queue_t **queue);
hsa_status_t HSA_API
hsa_soft_queue_create(hsa_region_t region, uint32_t size,
hsa_queue_type_t type, uint32_t features,
hsa_queue_type32_t type, uint32_t features,
hsa_signal_t completion_signal, hsa_queue_t **queue);
hsa_status_t HSA_API hsa_queue_destroy(hsa_queue_t *queue);
hsa_status_t HSA_API hsa_queue_inactivate(hsa_queue_t *queue);
projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_cpu_agent.cpp
+2 -2
View File
@@ -264,7 +264,7 @@ hsa_status_t CpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
*((uint32_t*)value) = 0;
break;
case HSA_AGENT_INFO_QUEUE_TYPE:
*((hsa_queue_type_t*)value) = static_cast<hsa_queue_type_t>(0);
*((hsa_queue_type32_t*)value) = HSA_QUEUE_TYPE_MULTI;
break;
case HSA_AGENT_INFO_NODE:
// TODO: associate with OS NUMA support (numactl / GetNumaProcessorNode).
@@ -360,7 +360,7 @@ hsa_status_t CpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
return HSA_STATUS_SUCCESS;
}
hsa_status_t CpuAgent::QueueCreate(size_t size, hsa_queue_type_t queue_type,
hsa_status_t CpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type,
core::HsaEventCallback event_callback,
void* data, uint32_t private_segment_size,
uint32_t group_segment_size,
projects/rocr-runtime/runtime/hsa-runtime/core/runtime/amd_gpu_agent.cpp
+2 -2
View File
@@ -733,7 +733,7 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
*((uint32_t*)value) = maxAqlSize_;
break;
case HSA_AGENT_INFO_QUEUE_TYPE:
*((hsa_queue_type_t*)value) = HSA_QUEUE_TYPE_MULTI;
*((hsa_queue_type32_t*)value) = HSA_QUEUE_TYPE_MULTI;
break;
case HSA_AGENT_INFO_NODE:
// TODO: associate with OS NUMA support (numactl / GetNumaProcessorNode).
@@ -863,7 +863,7 @@ hsa_status_t GpuAgent::GetInfo(hsa_agent_info_t attribute, void* value) const {
return HSA_STATUS_SUCCESS;
}
hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type_t queue_type,
hsa_status_t GpuAgent::QueueCreate(size_t size, hsa_queue_type32_t queue_type,
core::HsaEventCallback event_callback,
void* data, uint32_t private_segment_size,
uint32_t group_segment_size,
projects/rocr-runtime/runtime/hsa-runtime/core/runtime/host_queue.cpp
+1 -1
View File
@@ -47,7 +47,7 @@
namespace core {
HostQueue::HostQueue(hsa_region_t region, uint32_t ring_size,
hsa_queue_type_t type, uint32_t features,
hsa_queue_type32_t type, uint32_t features,
hsa_signal_t doorbell_signal)
: Queue(),
size_(ring_size),
projects/rocr-runtime/runtime/hsa-runtime/core/runtime/hsa.cpp
+3 -3
View File
@@ -543,7 +543,7 @@ hsa_status_t hsa_agent_major_extension_supported(uint16_t extension, hsa_agent_t
///
/// @return hsa_status
hsa_status_t hsa_queue_create(
hsa_agent_t agent_handle, uint32_t size, hsa_queue_type_t type,
hsa_agent_t agent_handle, uint32_t size, hsa_queue_type32_t type,
void (*callback)(hsa_status_t status, hsa_queue_t* source, void* data),
void* data, uint32_t private_segment_size, uint32_t group_segment_size,
hsa_queue_t** queue) {
@@ -557,7 +557,7 @@ hsa_status_t hsa_queue_create(
core::Agent* agent = core::Agent::Convert(agent_handle);
IS_VALID(agent);
hsa_queue_type_t agent_queue_type = HSA_QUEUE_TYPE_MULTI;
hsa_queue_type32_t agent_queue_type = HSA_QUEUE_TYPE_MULTI;
hsa_status_t status =
agent->GetInfo(HSA_AGENT_INFO_QUEUE_TYPE, &agent_queue_type);
assert(HSA_STATUS_SUCCESS == status);
@@ -586,7 +586,7 @@ hsa_status_t hsa_queue_create(
}
hsa_status_t hsa_soft_queue_create(hsa_region_t region, uint32_t size,
hsa_queue_type_t type, uint32_t features,
hsa_queue_type32_t type, uint32_t features,
hsa_signal_t doorbell_signal,
hsa_queue_t** queue) {
IS_OPEN();
projects/rocr-runtime/runtime/hsa-runtime/inc/hsa.h
+3 -3
View File
@@ -938,7 +938,7 @@ typedef enum {
HSA_AGENT_INFO_QUEUE_MAX_SIZE = 14,
/**
* Type of a queue created in the agent. The type of this attribute is
* ::hsa_queue_type_t.
* ::hsa_queue_type32_t.
*/
HSA_AGENT_INFO_QUEUE_TYPE = 15,
/**
@@ -2343,7 +2343,7 @@ typedef struct hsa_queue_s {
hsa_status_t HSA_API hsa_queue_create(
hsa_agent_t agent,
uint32_t size,
hsa_queue_type_t type,
hsa_queue_type32_t type,
void (*callback)(hsa_status_t status, hsa_queue_t *source, void *data),
void *data,
uint32_t private_segment_size,
@@ -2407,7 +2407,7 @@ hsa_status_t HSA_API hsa_queue_create(
hsa_status_t HSA_API hsa_soft_queue_create(
hsa_region_t region,
uint32_t size,
hsa_queue_type_t type,
hsa_queue_type32_t type,
uint32_t features,
hsa_signal_t doorbell_signal,
hsa_queue_t **queue);