Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gaoqiong
MIGraphX
Commits
82c58e44
Commit
82c58e44
authored
Feb 16, 2023
by
Alan Turner
Browse files
Formatting
parent
84189dd5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
10 deletions
+20
-10
src/targets/gpu/kernels/include/migraphx/kernels/ck_gemm_includes.hpp
...gpu/kernels/include/migraphx/kernels/ck_gemm_includes.hpp
+1
-1
src/targets/gpu/kernels/include/migraphx/kernels/ck_gemm_softmax_gemm.hpp
...kernels/include/migraphx/kernels/ck_gemm_softmax_gemm.hpp
+1
-1
src/targets/gpu/kernels/include/migraphx/kernels/ck_gemm_softmax_gemm_includes.hpp
...nclude/migraphx/kernels/ck_gemm_softmax_gemm_includes.hpp
+18
-8
No files found.
src/targets/gpu/kernels/include/migraphx/kernels/ck_gemm_includes.hpp
View file @
82c58e44
...
...
@@ -153,7 +153,7 @@ template <typename ALayout,
ck
::
index_t
CShuffleNXdlPerWavePerShuffle
,
typename
CDEBlockTransferClusterLengths_MBlock_MPerBlock_NBlock_NPerBlock
,
ck
::
index_t
CDEBlockTransferScalarPerVector_NPerBlock
,
ck
::
LoopScheduler
LoopSched
=
ck
::
make_default_loop_scheduler
(),
ck
::
LoopScheduler
LoopSched
=
ck
::
make_default_loop_scheduler
(),
ck
::
PipelineVersion
PipelineVer
=
ck
::
PipelineVersion
::
v1
>
struct
CK_DeviceGemmMultipleD
{
...
...
src/targets/gpu/kernels/include/migraphx/kernels/ck_gemm_softmax_gemm.hpp
View file @
82c58e44
...
...
@@ -124,7 +124,7 @@ __device__ void ck_gemm_softmax_gemm_matrix(C c, A a, B b, B1 b1)
BlockToCTileMap_M00_N0_M01Adapt
<
MPerBlock
,
Gemm1NPerBlock
,
decltype
(
c_grid_desc_m_n
)
>
(
c_grid_desc_m_n
);
//using C0MatrixMask = ck::conditional_t<gemm.get_MOUT(),
//
using C0MatrixMask = ck::conditional_t<gemm.get_MOUT(),
// C0MatrixMask_impl<MaskOutUpperTrianglePredicate>,
// C0MatrixMask_impl<MaskDisabledPredicate>>;
// template<>
...
...
src/targets/gpu/kernels/include/migraphx/kernels/ck_gemm_softmax_gemm_includes.hpp
View file @
82c58e44
...
...
@@ -140,8 +140,10 @@ struct MaskDisabledPredicate
return
false
;
};
__host__
__device__
constexpr
bool
IsTileSkippable
(
ck
::
index_t
/*m*/
,
ck
::
index_t
/*n*/
,
ck
::
index_t
/*m_tile*/
,
ck
::
index_t
/*n_tile*/
)
const
__host__
__device__
constexpr
bool
IsTileSkippable
(
ck
::
index_t
/*m*/
,
ck
::
index_t
/*n*/
,
ck
::
index_t
/*m_tile*/
,
ck
::
index_t
/*n_tile*/
)
const
{
return
false
;
}
...
...
@@ -149,7 +151,10 @@ struct MaskDisabledPredicate
struct
MaskOutUpperTrianglePredicate
{
__host__
__device__
constexpr
bool
operator
()(
ck
::
index_t
m
,
ck
::
index_t
n
)
const
{
return
n
>
m
;
}
__host__
__device__
constexpr
bool
operator
()(
ck
::
index_t
m
,
ck
::
index_t
n
)
const
{
return
n
>
m
;
}
__host__
__device__
constexpr
bool
IsTileSkippable
(
ck
::
index_t
m
,
ck
::
index_t
n
,
ck
::
index_t
m_tile
,
ck
::
index_t
/*n_tile*/
)
const
...
...
@@ -163,7 +168,10 @@ struct MaskOutUpperTrianglePredicate
template
<
typename
MaskOutPredicate
>
struct
C0MatrixMask_impl
{
__host__
__device__
C0MatrixMask_impl
(
ck
::
index_t
NRaw
)
:
NRaw_
(
NRaw
),
predicate_
(
MaskOutPredicate
{})
{}
__host__
__device__
C0MatrixMask_impl
(
ck
::
index_t
NRaw
)
:
NRaw_
(
NRaw
),
predicate_
(
MaskOutPredicate
{})
{
}
__host__
__device__
constexpr
bool
IsNOutOfBound
(
/*index_t m, */
ck
::
index_t
n
)
const
{
...
...
@@ -266,15 +274,17 @@ struct CK_DeviceBatchedGemmSoftmaxGemm_Xdl_CShuffle
CElementwiseOperation
c_element_op
{};
AccElementwiseOperation
acc_element_op
{
alpha
};
//static constexpr auto get_MOUT() { return MaskOutUpperTriangle; };
//
static constexpr auto get_MOUT() { return MaskOutUpperTriangle; };
using
C0MatrixMask
=
ck
::
conditional_t
<
MaskOutUpperTriangle
,
C0MatrixMask_impl
<
MaskOutUpperTrianglePredicate
>
,
C0MatrixMask_impl
<
MaskDisabledPredicate
>>
;
C0MatrixMask_impl
<
MaskOutUpperTrianglePredicate
>
,
C0MatrixMask_impl
<
MaskDisabledPredicate
>>
;
struct
C0MM_Wrapper
{
__device__
C0MM_Wrapper
(
const
unsigned
int
n
)
:
c0_matrix_mask_
{
static_cast
<
ck
::
index_t
>
(
n
)}
{}
__device__
C0MM_Wrapper
(
const
unsigned
int
n
)
:
c0_matrix_mask_
{
static_cast
<
ck
::
index_t
>
(
n
)}
{
}
C0MatrixMask
c0_matrix_mask_
;
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment