[PATCH] D42762: Rewrite the VS Integration Scripts

Hans Wennborg via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 1 10:48:57 PST 2018


hans added inline comments.


================
Comment at: llvm/tools/msbuild/Clang.Cpp.Common.props:41
+    
+    <!-- The registry key may not be set if it's an old installer, try the newest version that exists -->
+    <LLVMVersion Condition="'$(LLVMVersion)' == '' and Exists('$(LLVMInstallDir)\lib\clang\7.0.0')">7.0.0</LLVMVersion>
----------------
zturner wrote:
> hans wrote:
> > As I mentioned before, separating the toolset config from the actual toolchain installation makes me a little nervous.
> > 
> > But if we're doing it, the version checks below should probably include the .1 versions too, i.e. at least 5.0.1 and 6.0.1.
> Unless we're going to release the full thing including the compiler, linker, etc through the marketplace I don't see an alternative.  In any case, I actually think this it's preferable this way.  There's nothing really about the two that benefits from having them coupled together, as far as I can see.   I'm willing to be convinced though, if we can figure out how to to do it so that we can still ship it on the marketplace.
"There's nothing really about the two that benefits from having them coupled together,"

The toolset needs to know at least where to find the toolchain and how to invoke it. If we decouple them, there needs to be an interface between them that can't change: in this case the LLVM path and version number in the registry.

But at the same time you're baking in all this logic in the toolset about how to invoke the toolchain, what flags are supported, etc. Those things are strongly dependent on the toolchain, which in this de-coupled world seems problematic. It seems like you're actually making the coupling tighter in that way, except you still want to ship the two parts separately.

Are there restrictions in the marketplace about how big a vsix can be? Because if not, I think we could just package up clang+headers+runtime into a vsix and ship the whole thing, and maybe that would be the best thing.

Or we could just stick to the current installer version and make it a little smarter about finding VS2017. Maybe instead of the batch files we write an actual program that finds the installation and copies the files.


================
Comment at: llvm/tools/msbuild/LLVM.props:8
+    <!-- Friendly names added to the PlatformToolset in the property pages. -->
+    <_PlatformToolsetFriendlyNameFor_llvm Condition="'$(_PlatformToolsetFriendlyNameFor_llvm)' == ''">Clang for Windows</_PlatformToolsetFriendlyNameFor_llvm>
+  </PropertyGroup>
----------------
zturner wrote:
> hans wrote:
> > Hmm, we previously intentionally called the toolset "LLVM" with the thinking that it would eventually include lld and designated the complete llvm toolchain, not just Clang. And is the "for Windows" part necessary?
> Do you think there's any value in having a toolset that does Clang+Link and a second one that does Clang+LLD?  Or do you think we should stick with only a single one?  I can change the name to LLVM though.
The best would be to only have one, but where the user could select between the two linkers, I think.


================
Comment at: llvm/tools/msbuild/Toolset.targets:38
+    
+    <!-- Warn if Fiber Safe Optimizations are enabled, and then ignore them. -->
+    <Warning Condition="'%(ClCompile.EnableFiberSafeOptimizations)' == 'true'"
----------------
zturner wrote:
> hans wrote:
> > This seems to duplicate a lot of logic from clang-cl. It's nice to provide a good UI for the user, but maintaining this seems a lot of work. Are you not concerned that this will rot?
> I don't think it will.  Maybe I'm being overly optimistic here, but the only case we would ever need to maintain this again is if we started supporting these options.  Fiber Safe Optimizations, for example, I'm pretty sure we will never support.  If MSVC ever removes the option, for example, we can do nothing and continue to work.
> 
> We could also just silently ignore them and just pass the option through to clang-cl, but these are pretty unusual options with pretty specialized use cases, so I feel like if I had gone out of my way to enable such a strange option I would want to know if the compiler was not going to respect it.
I feel pretty strongly that we should handle this clang-cl side. If a flag is not supported, either we should ignore it, or if it's something the user would want to know about us not supporting, we should warn. That's what clang-cl tries to do currently, and if there are flags we don't get right, we should fix it.

And we do move flags from the unsupported to supported category now and then, so the "only case we would ever need to maintain this again is if we started supporting these options" scenario is real.


================
Comment at: llvm/tools/msbuild/Toolset.targets:46
+             File="@(ClCompile)(0,0)"
+             Text="clang-cl does not support MSVC Link Time Optimization.  Disable this option in compatibility settings to silence this warning."/>
+
----------------
zturner wrote:
> hans wrote:
> > But maybe we want clang-cl to map this to -flto one day. Now we need to update two places. And with the toolset/toolchain install split, the two places may be installed separately :-/
> That's even better then.  All we have to do is change this xml, push a new build to the market place, and the VS UI will update their extension for them.
> 
> Note that we could do the mapping at the MSBuild level, in this file down below where we have an `ItemGroup`.  Just add a line that says `<AdditionalOptions Condition="%(ClCompile.WholeProgramOptimization)' == 'true'>-flto=thin %(AdditionalOptions)</AdditionalOptions>`
> 
> and we can do this without touching clang.
But the toolset is decoupled from the toolchain in your proposal.

Not only would we need to update both clang-cl and this file, but this file would need to handle clang-cl versions both before and after.


================
Comment at: llvm/tools/msbuild/Toolset.targets:83
+    
+    <!-- Warn if XML Documentation is generated, and then ignore it. -->
+    <Warning Condition="'%(ClCompile.GenerateXMLDocumentationFiles)' == 'true'"
----------------
zturner wrote:
> hans wrote:
> > Keeping up with all these flags seems like a huge amount of work. Why not just let clang-cl ignore it?
> See the large comment at the top of the file.  For some options, we could probably get by with this.  Maybe even this one, I debated on this particular one.
> 
> My bar was "If the option fundamentally changes assumptions about the way code could be compiled, we should generate an error.  If it changes the behavior of the language in a way we don't support,  changes the way we generate code in a meaningful way, or causes specialized output files to be written, warn, and if it's an option we ignore then drop it"
> 
> The last category there we could probably just pass through in some cases, but in that comment I also mentioned a case where setting an option that clang-cl ignores impacts MSBuild's ability to figure out dependencies and ends up causing a full rebuild every time even when nothing changed.
> 
> We can scour the entire cl build tasks and try to discover if any other ones have unintended consequences, but I think it's easier to just turn them off at the MSBuild level.  And as a side benefit, the user gets shorter command lines, which is always nice.
> 
> As for maintenance, this all looks like zero-maintenance code to me.  Did you have an example in mind of where we'd need to update this?  Whether it be a new VS version, or VS dropping support for one of these options or deprecating them, I don't think we'd have to do anything.
The maintenance would come from when clang-cl changes how it handles some option, or when VS adds new options.


================
Comment at: llvm/tools/msbuild/install.bat:10
+REM Older versions of VS would look for these files in the Program Files\MSBuild directory
+REM but with VS2017 it seems to look for these directly in the Visual Studio instance.
+REM This means we'll need to do a little extra work to properly detect all the various
----------------
zturner wrote:
> hans wrote:
> > Don't we want to support at least 2015 too?
> Mentioned in the other review, but the install.bat file shouldn't really be used anymore except for during development.  The VSIX supports both 2015 and 2017 (I tested it in both and confirmed it works)
Hmm, but then we should delete it, or at least take it out of the installer, and we need a replacement. As it is now, if we land this, it breaks the installer for versions before 2017.


https://reviews.llvm.org/D42762





More information about the llvm-commits mailing list