Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
40b09155
R
runtime
项目概览
dotNET Platform
/
runtime
大约 1 年 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
40b09155
编写于
2月 04, 2021
作者:
D
David Wrighton
提交者:
GitHub
2月 04, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix dynamic pgo (#47790)
* Fix dynamic pgo schema data copy
上级
d138818b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
13 deletion
+9
-13
src/coreclr/vm/pgo.cpp
src/coreclr/vm/pgo.cpp
+6
-13
src/tests/issues.targets
src/tests/issues.targets
+3
-0
未找到文件。
src/coreclr/vm/pgo.cpp
浏览文件 @
40b09155
...
...
@@ -653,14 +653,8 @@ HRESULT PgoManager::ComputeOffsetOfActualInstrumentationData(const ICorJitInfo::
return
E_NOTIMPL
;
}
// Determine alignment of instrumentation data
UINT
maxAlign
=
0
;
for
(
UINT32
iSchema
=
0
;
iSchema
<
countSchemaItems
;
iSchema
++
)
{
maxAlign
=
max
(
InstrumentationKindToAlignment
(
pSchema
[
iSchema
].
InstrumentationKind
),
maxAlign
);
}
*
offsetOfActualInstrumentationData
=
(
UINT
)
AlignUp
(
headerSize
,
maxAlign
);
// Align all instrumentation at size_t alignment, as the copy routine will copy in size_t units
*
offsetOfActualInstrumentationData
=
(
UINT
)
AlignUp
(
headerSize
,
sizeof
(
size_t
));
return
S_OK
;
}
...
...
@@ -817,7 +811,6 @@ HRESULT PgoManager::getPgoInstrumentationResults(MethodDesc* pMD, BYTE** pAlloca
if
(
ReadInstrumentationSchemaWithLayoutIntoSArray
(
found
->
GetData
(),
found
->
countsOffset
,
found
->
countsOffset
,
&
schemaArray
))
{
EX_TRY
{
// TypeHandles can't reliably be loaded at ReadPGO time
...
...
@@ -1054,17 +1047,17 @@ HRESULT PgoManager::getPgoInstrumentationResultsInstance(MethodDesc* pMD, BYTE**
}
StackSArray
<
ICorJitInfo
::
PgoInstrumentationSchema
>
schemaArray
;
if
(
ReadInstrumentationSchemaWithLayoutIntoSArray
(
found
->
header
.
GetData
(),
found
->
header
.
countsOffset
,
found
->
header
.
countsOffset
,
&
schemaArray
))
if
(
ReadInstrumentationSchemaWithLayoutIntoSArray
(
found
->
header
.
GetData
(),
found
->
header
.
countsOffset
,
0
,
&
schemaArray
))
{
size_t
schemaDataSize
=
schemaArray
.
GetCount
()
*
sizeof
(
ICorJitInfo
::
PgoInstrumentationSchema
);
size_t
schemaDataSize
=
AlignUp
(
schemaArray
.
GetCount
()
*
sizeof
(
ICorJitInfo
::
PgoInstrumentationSchema
),
sizeof
(
size_t
)
);
size_t
instrumentationDataSize
=
0
;
if
(
schemaArray
.
GetCount
()
>
0
)
{
auto
lastSchema
=
schemaArray
[
schemaArray
.
GetCount
()
-
1
];
instrumentationDataSize
=
lastSchema
.
Offset
+
lastSchema
.
Count
*
InstrumentationKindToSize
(
lastSchema
.
InstrumentationKind
)
-
found
->
header
.
countsOffset
;
instrumentationDataSize
=
AlignUp
(
lastSchema
.
Offset
+
lastSchema
.
Count
*
InstrumentationKindToSize
(
lastSchema
.
InstrumentationKind
),
sizeof
(
size_t
))
;
}
*
pAllocatedData
=
new
BYTE
[
schemaDataSize
+
instrumentationDataSize
];
*
ppSchema
=
(
ICorJitInfo
::
PgoInstrumentationSchema
*
)
pAllocatedData
;
*
ppSchema
=
(
ICorJitInfo
::
PgoInstrumentationSchema
*
)
*
pAllocatedData
;
*
pCountSchemaItems
=
schemaArray
.
GetCount
();
memcpy
(
*
pAllocatedData
,
schemaArray
.
OpenRawBuffer
(),
schemaDataSize
);
schemaArray
.
CloseRawBuffer
();
...
...
src/tests/issues.targets
浏览文件 @
40b09155
...
...
@@ -966,6 +966,9 @@
<!-- Known failures for mono runtime on *all* architectures/operating systems -->
<ItemGroup
Condition=
"'$(RuntimeFlavor)' == 'mono'"
>
<ExcludeList
Include=
"$(XunitTestBinBase)/JIT/Directed/DynamicPgo/**"
>
<Issue>
Mono doesn't have a dynamic pgo or tiered compilation infrastructure
</Issue>
</ExcludeList>
<ExcludeList
Include=
"$(XunitTestBinBase)/JIT/SIMD/Vector3Interop_r/*"
>
<Issue>
https://github.com/dotnet/runtime/issues/46174
</Issue>
</ExcludeList>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录